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 b8b972fe74 Merge branch '2.1' into 2.2 ... * 2.1: added trusted hosts check Conflicts: src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php src/Symfony/Component/HttpFoundation/Request.php		2013-08-07 16:00:53 +02:00
..
Compiler	Merge branch '2.1' into 2.2	2013-04-17 07:27:14 +02:00
Configuration.php	Merge branch '2.1' into 2.2	2013-08-07 16:00:53 +02:00
FrameworkExtension.php	Merge branch '2.1' into 2.2	2013-08-07 16:00:53 +02:00