diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
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.
1493f747a2
symfony/src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures
History
Fabien Potencier 1493f747a2 Merge branch '2.0' into 2.1 
* 2.0:
  bumped Symfony version to 2.0.21-DEV
  [FrameworkBundle] fixed trusted_proxies configuration for some edge cases
  [FrameworkBundle] fixed XSD for the trusted-proxies setting
  updated VERSION for 2.0.20
  update CONTRIBUTORS for 2.0.20
  updated CHANGELOG for 2.0.20

Conflicts:
	CONTRIBUTORS.md
	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/ConfigurationTest.php
	src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/Fixtures/xml/full.xml
	src/Symfony/Component/HttpKernel/Kernel.php
2012-12-20 15:24:08 +01:00
..
php Merge branch '2.0' into 2.1 2012-12-20 15:24:08 +01:00
TestBundle updated license blocks 2012-03-31 18:00:32 -03:00
xml Merge branch '2.0' into 2.1 2012-12-20 15:24:08 +01:00
yml Merge branch '2.0' into 2.1 2012-12-20 15:24:08 +01:00