diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-12-05 13:00:15 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-12-05 13:00:15 +0100 |
| commit | 7b4c83290a3d948e2ac7e5fc41073db13c32795c (patch) | |
| tree | 1250b2ae585fd621d463db96c93c40b197f0bf01 /README.md | |
| parent | 95579d91a123f8b2af6709bcf1e4b2157a65c6ce (diff) | |
| parent | 1aaa26cad526c885a0ffd4fcef8a855a63024725 (diff) | |
| download | symfony-security-7b4c83290a3d948e2ac7e5fc41073db13c32795c.zip symfony-security-7b4c83290a3d948e2ac7e5fc41073db13c32795c.tar.gz symfony-security-7b4c83290a3d948e2ac7e5fc41073db13c32795c.tar.bz2 | |
Merge branch '2.5' into 2.6
* 2.5:
CS fixes
[2.3] More cs fixes
Removed unused imports
CS fixes
bumped Symfony version to 2.5.9
updated VERSION for 2.5.8
update CONTRIBUTORS for 2.5.8
updated CHANGELOG for 2.5.8
bumped Symfony version to 2.3.24
updated VERSION for 2.3.23
update CONTRIBUTORS for 2.3.23
updated CHANGELOG for 2.3.23
Conflicts:
src/Symfony/Component/Console/Helper/ProgressBar.php
src/Symfony/Component/Debug/ErrorHandler.php
src/Symfony/Component/HttpKernel/Kernel.php
src/Symfony/Component/Security/Http/HttpUtils.php
src/Symfony/Component/Validator/Mapping/Factory/LazyLoadingMetadataFactory.php
Diffstat (limited to 'README.md')
0 files changed, 0 insertions, 0 deletions