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.
symfony/src/Symfony
Fabien Potencier 31f0efd7bc Merge branch '2.0' into 2.1
* 2.0:
  added trusted hosts check

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php
	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
	src/Symfony/Component/HttpFoundation/Tests/RequestTest.php
2013-08-07 15:58:42 +02:00
..
Bridge Fix several instances of doubled words 2013-05-26 14:42:07 -04:00
Bundle Merge branch '2.0' into 2.1 2013-08-07 15:58:42 +02:00
Component Merge branch '2.0' into 2.1 2013-08-07 15:58:42 +02:00