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 44501976ae Merge branch '2.4' into 2.5 ... * 2.4: [Validator] Add missing ru translations don't disable constructor calls to mockups of classes that extend internal PHP classes special handling for the JsonDescriptor to work around changes in PHP's JSON pretty printer Conflicts: src/Symfony/Component/Security/Core/Tests/Authentication/AuthenticationProviderManagerTest.php src/Symfony/Component/Security/Core/Tests/Authentication/Provider/DaoAuthenticationProviderTest.php src/Symfony/Component/Security/Core/Tests/Authentication/Provider/PreAuthenticatedAuthenticationProviderTest.php src/Symfony/Component/Security/Core/Tests/Authentication/Provider/RememberMeAuthenticationProviderTest.php src/Symfony/Component/Security/Core/Tests/Authentication/Provider/UserAuthenticationProviderTest.php		2014-06-23 09:34:27 +02:00
..
FrameworkBundle	Merge branch '2.4' into 2.5	2014-06-23 09:34:27 +02:00
SecurityBundle	Merge branch '2.4'	2014-04-16 12:36:21 +02:00
TwigBundle	Merge branch '2.4' into 2.5	2014-06-20 19:38:20 +02:00
WebProfilerBundle	Merge branch '2.4' into 2.5	2014-06-12 12:01:04 +02:00