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.

Nicolas Grekas 7adba99975 Merge branch '2.3' into 2.6 ... * 2.3: [HttpKernel] Embed the original exception as previous to bounced exceptions [Enhancement] netbeans - force interactive shell when limited detection [StringUtil] Fixed singularification of 'movies' Fix some phpdocs for Twig extensions & templating helpers Use specialized config methods instead of the generic ifTrue() method [DoctrineBridge] Add missing variable declaration in testcase Conflicts: src/Symfony/Component/Console/Application.php		2015-04-03 17:17:51 +02:00
..
Compiler	Merge branch '2.5' into 2.6	2014-12-22 17:44:09 +01:00
Configuration.php	Merge branch '2.3' into 2.6	2015-04-03 17:17:51 +02:00
FrameworkExtension.php	Merge branch '2.3' into 2.6	2015-03-07 08:40:15 +01:00