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 a6e08b18de Merge branch '2.0' into 2.1 ... * 2.0: [TwigBundle] Moved the registration of the app global to the environment needs to use simpleContent in xsd to allow empty elements bumped Symfony version to 2.0.19-DEV removed wrong routing xsd statement `mixed="true"` removed unused attribute from routing.xsd updated VERSION for 2.0.19 update CONTRIBUTORS for 2.0.19 updated CHANGELOG for 2.0.19 Conflicts: CONTRIBUTORS.md src/Symfony/Bundle/TwigBundle/Resources/config/twig.xml src/Symfony/Bundle/TwigBundle/TwigEngine.php src/Symfony/Component/HttpKernel/Kernel.php		2012-12-03 14:28:41 +01:00
..
Symfony	Merge branch '2.0' into 2.1	2012-12-03 14:28:41 +01:00