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 64535bbcb2 Merge branch '2.2' into 2.3 ... * 2.2: [HttpKernel] added a missing dep for dev [Form] fixed wrong call to setTimeZone() (closes #8644) Fix issue with \DateTimeZone::UTC / 'UTC' for PHP 5.4 [Form] Removed the "disabled" attribute from the placeholder option in select fields due to problems with the BlackBerry 10 browser [routing] added ability for apache matcher to handle array values removed dead code and fixed CS [Validator] fixed StaticMethodLoader trying to invoke methods of abstract classes (closes #8589) Conflicts: src/Symfony/Bundle/TwigBundle/TokenParser/RenderTokenParser.php src/Symfony/Component/Form/FormConfigBuilder.php src/Symfony/Component/HttpKernel/composer.json src/Symfony/Component/Validator/Tests/GraphWalkerTest.php		2013-08-02 22:53:38 +02:00
..
EsiFragmentRenderer.php	renamed some classes and Twig functions to more descriptive names (refs #6871)	2013-02-01 15:17:20 +01:00
FragmentHandler.php	Merge branch '2.2' into 2.3	2013-08-02 22:53:38 +02:00
FragmentRendererInterface.php	renamed some classes and Twig functions to more descriptive names (refs #6871)	2013-02-01 15:17:20 +01:00
HIncludeFragmentRenderer.php	Merge branch '2.2' into 2.3	2013-07-11 21:36:36 +02:00
InlineFragmentRenderer.php	Merge branch '2.2' into 2.3	2013-07-11 21:36:36 +02:00
RoutableFragmentRenderer.php	renamed some classes and Twig functions to more descriptive names (refs #6871)	2013-02-01 15:17:20 +01:00