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 aca311e077 Merge branch '2.0' into 2.1 ... * 2.0: Added comment [FrameworkBundle] Added tests for trusted_proxies configuration. [FrameworkBundle] Added a check on file mime type for CodeHelper::fileExcerpt() checked for a potentially missing key [FrameworkBundle] used the new method for trusted proxies remove realpath call Conflicts: src/Symfony/Bundle/FrameworkBundle/DependencyInjection/Configuration.php		2012-12-15 17:44:57 +01:00
..
Symfony	Merge branch '2.0' into 2.1	2012-12-15 17:44:57 +01:00