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.

Nicolas Grekas 6005fe53f7 Merge branch '2.8' ... Conflicts: composer.json src/Symfony/Bundle/FrameworkBundle/Resources/config/annotations.xml src/Symfony/Bundle/FrameworkBundle/Resources/config/routing.xml src/Symfony/Bundle/FrameworkBundle/Resources/config/security_csrf.xml src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Component/DependencyInjection/ContainerBuilder.php src/Symfony/Component/Security/Core/composer.json src/Symfony/Component/Security/Csrf/composer.json src/Symfony/Component/Security/Http/composer.json src/Symfony/Component/Security/composer.json src/Symfony/Component/Translation/PluralizationRules.php src/Symfony/Component/VarDumper/Exception/ThrowingCasterException.php		2015-10-07 09:44:07 +02:00
..
DelegatingLoader.php	Merge branch '2.8'	2015-10-07 09:44:07 +02:00
RedirectableUrlMatcher.php	Remove aligned '=>' and '='	2014-10-26 08:30:58 +01:00
Router.php	feature #13396 [Routing] remove deprecations for 3.0 (Tobion)	2015-01-31 21:34:12 +01:00