diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-12-30 10:03:46 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-12-30 10:03:46 +0100 |
| commit | cd277e8552ccb2c0242b244473c708b5c6600b74 (patch) | |
| tree | a4ceeb5ecd6dccdfa895052f0326e12ae98141e2 /Http/README.md | |
| parent | 91e9fcb3bf19727509df4b6a89568db78e953c7d (diff) | |
| parent | f751ab52989df43f6bebbec3a7ba5dd5ecccaa62 (diff) | |
| download | symfony-security-cd277e8552ccb2c0242b244473c708b5c6600b74.zip symfony-security-cd277e8552ccb2c0242b244473c708b5c6600b74.tar.gz symfony-security-cd277e8552ccb2c0242b244473c708b5c6600b74.tar.bz2 | |
Merge branch '2.3' into 2.5
* 2.3:
Updated generateSql tool
Fix the implementation of deprecated Locale classes
Fix phpdoc and coding standards
Replace usages of the deprecated TypeTestCase by the new one
Remove usages of deprecated constants
Update functional tests to use the PSR NullLogger
Make fabbot happy
Clean up testing
[DomCrawler] fixed bug #12143
Conflicts:
src/Symfony/Bridge/Doctrine/Tests/Validator/Constraints/UniqueEntityValidatorTest.php
src/Symfony/Bundle/FrameworkBundle/Tests/Templating/TimedPhpEngineTest.php
src/Symfony/Bundle/TwigBundle/Tests/Loader/FilesystemLoaderTest.php
src/Symfony/Component/Console/Application.php
src/Symfony/Component/DomCrawler/Crawler.php
src/Symfony/Component/Form/Tests/Extension/Core/Type/CollectionTypeTest.php
src/Symfony/Component/Form/Tests/Extension/Csrf/Type/FormTypeCsrfExtensionTest.php
src/Symfony/Component/HttpKernel/Tests/Bundle/BundleTest.php
src/Symfony/Component/Serializer/Encoder/EncoderInterface.php
src/Symfony/Component/Serializer/Encoder/XmlEncoder.php
src/Symfony/Component/Validator/Tests/Mapping/ClassMetadataFactoryTest.php
Diffstat (limited to 'Http/README.md')
0 files changed, 0 insertions, 0 deletions