diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-02-11 14:52:09 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-02-11 14:52:09 +0100 |
| commit | ae020b9dc10e6438dc4033103c16bae7d46a4dd6 (patch) | |
| tree | 9c97b190916296a384c99d47ff167771702640b7 /Core/Encoder | |
| parent | d8edd9cf953bc18a76312aae4c10ff1f5d4783f9 (diff) | |
| parent | fc8250e983069954aa8b74703664cf5dc988d863 (diff) | |
| download | symfony-security-ae020b9dc10e6438dc4033103c16bae7d46a4dd6.zip symfony-security-ae020b9dc10e6438dc4033103c16bae7d46a4dd6.tar.gz symfony-security-ae020b9dc10e6438dc4033103c16bae7d46a4dd6.tar.bz2 | |
Merge branch '2.3' into 2.4v2.4.2
* 2.3:
fixed various inconsistencies
reduced recursion when building DumperPrefixCollection
renamed variables - making next change more readable
removing dead code.
[DomCrawler] Fixed filterXPath() chaining
[DomCrawler] Fixed incorrect handling of image inputs
Conflicts:
src/Symfony/Component/DomCrawler/Crawler.php
src/Symfony/Component/EventDispatcher/Tests/EventDispatcherTest.php
src/Symfony/Component/Form/Extension/DependencyInjection/DependencyInjectionExtension.php
src/Symfony/Component/Serializer/Tests/Normalizer/CustomNormalizerTest.php
src/Symfony/Component/Templating/Tests/Loader/CacheLoaderTest.php
src/Symfony/Component/Templating/Tests/Loader/LoaderTest.php
Diffstat (limited to 'Core/Encoder')
0 files changed, 0 insertions, 0 deletions