This repository has been archived on 2023-08-20. You can view files and clone it, but cannot push or open issues or pull requests.

Fabien Potencier 83ee704816 Merge branch '2.5' into 2.6 ... * 2.5: Configure firewall's kernel exception listener with configured entry point or a default entry point PSR-2 fixes [DependencyInjection] make paths relative to __DIR__ in the generated container Fixed the syntax of a composer.json file Fixed the symfony/config version constraint Tweaked the password-compat version constraint Docblock fixes Remove dialog usage define constant only if it wasn't defined before Fix incorrect spanish translation Fixed typos Conflicts: src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php src/Symfony/Component/OptionsResolver/Options.php src/Symfony/Component/OptionsResolver/OptionsResolverInterface.php src/Symfony/Component/Process/ProcessPipes.php src/Symfony/Component/Security/Http/Tests/Firewall/RememberMeListenerTest.php src/Symfony/Component/Serializer/Normalizer/DenormalizableInterface.php src/Symfony/Component/Validator/ConstraintViolation.php src/Symfony/Component/Yaml/Inline.php src/Symfony/Component/Yaml/Parser.php		2014-12-02 21:19:20 +01:00
..
Doctrine	Merge branch '2.5' into 2.6	2014-12-02 21:19:20 +01:00
Monolog	Merge branch '2.5' into 2.6	2014-12-02 21:19:20 +01:00
Propel1	Merge branch '2.5' into 2.6	2014-12-02 21:19:20 +01:00
ProxyManager	Merge branch '2.5' into 2.6	2014-12-02 21:19:20 +01:00
Swiftmailer	Merge branch '2.5'	2014-10-26 08:46:28 +01:00
Twig	Merge branch '2.5' into 2.6	2014-12-02 21:19:20 +01:00