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 8f0b984d76 Merge branch '2.5' ... * 2.5: (25 commits) [Bridge][Twig] Replace deprecated features Yaml component change in 2.5 [HttpFoundation] fix switch statement [serializer] fixed whitespace issue when decoding xml [Doctrine Bridge] fix DBAL session handler according to PdoSessionHandler #10862 loadClassMetadata vs loadValidatorMetadata: revert default config fixed previous merge Added phpdoc for Cache-Control directives methods [Console] OutputFormatter Unset Bold has wrong id [Debug] fix debug handlers config [Serializer] fixed bc-break with cdata-section nodes Remove undefined variable $e [Debug] fix wrong case mismatch exception bumped Symfony version to 2.5.1 bumped Symfony version to 2.4.7 bumped Symfony version to 2.3.17 Fix a parameter name in a test updated VERSION for 2.5.0 updated CHANGELOG for 2.5.0 updated VERSION for 2.4.6 ... Conflicts: src/Symfony/Component/HttpFoundation/Session/Storage/Handler/PdoSessionHandler.php src/Symfony/Component/HttpFoundation/Tests/Session/Storage/Handler/PdoSessionHandlerTest.php src/Symfony/Component/HttpKernel/Kernel.php		2014-06-07 17:54:31 +02:00
..
Bridge	Merge branch '2.5'	2014-06-07 17:54:31 +02:00
Bundle	Merge branch '2.5'	2014-06-07 17:54:31 +02:00
Component	Merge branch '2.5'	2014-06-07 17:54:31 +02:00