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 c558887cdf Merge branch '2.4' into 2.5 ... * 2.4: [Bridge][Twig] Replace deprecated features [HttpFoundation] fix switch statement [Doctrine Bridge] fix DBAL session handler according to PdoSessionHandler fixed previous merge Added phpdoc for Cache-Control directives methods Remove undefined variable $e 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.4.6 updated CHANGELOG for 2.4.6 updated VERSION for 2.3.16 update CONTRIBUTORS for 2.3.16 updated CHANGELOG for 2.3.16 [HttpFoundation] use different approach for duplicate keys in postgres, fix merge for sqlsrv and oracle Conflicts: src/Symfony/Component/HttpKernel/Kernel.php		2014-06-06 05:57:03 +02:00
..
Doctrine	Merge branch '2.4' into 2.5	2014-06-06 05:57:03 +02:00
Monolog	Merge branch '2.4'	2014-04-16 12:36:21 +02:00
Propel1	Fix doc blocks	2014-04-18 22:54:24 +02:00
ProxyManager	Merge branch '2.4'	2014-04-16 12:36:21 +02:00
Swiftmailer	Merge branch '2.4'	2014-04-16 10:08:40 +02:00
Twig	Merge branch '2.4' into 2.5	2014-06-06 05:57:03 +02:00