Skip to content

Commit 191aa6a

Browse files
Merge branch '3.3' into 3.4
* 3.3: Clean up Update return type in docblock. PHP CS Fixer: no need to exclude xml and yml files PHP CS Fixer: no need to exclude json file Update LICENSE year... forever
2 parents f761b4e + c164f4f commit 191aa6a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ CHANGELOG
2222
-----
2323

2424
* [BC BREAK] `Client::followRedirect()` won't redirect responses with
25-
a non-3xx Status Code and `Location` header anymore, as per
25+
a non-3xx Status Code and `Location` header anymore, as per
2626
http://tools.ietf.org/html/rfc2616#section-14.30
2727

2828
* added `Client::getInternalRequest()` and `Client::getInternalResponse()` to

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2004-2017 Fabien Potencier
1+
Copyright (c) 2004-present Fabien Potencier
22

33
Permission is hereby granted, free of charge, to any person obtaining a copy
44
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)