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 643fdc8124 Merge branch '2.3' into 2.5 ... * 2.3: [FrameworkBundle] minor fix [Console] add a dot [Form] remove unnecessary call Conflicts: src/Symfony/Component/Console/Tests/Fixtures/application_1.json src/Symfony/Component/Console/Tests/Fixtures/application_2.json		2014-10-05 15:57:04 +02:00
..
Controller.php	Merge branch '2.4'	2014-04-18 22:40:13 +02:00
ControllerNameParser.php	[FrameworkBundle] minor fix	2014-10-05 15:47:08 +02:00
ControllerResolver.php	removed unneeded use statements	2014-01-01 08:52:14 +01:00
RedirectController.php	fixed types in phpdocs	2014-04-16 08:51:57 +02:00
TemplateController.php	made phpdoc types consistent with those defined in Hack	2014-04-15 07:41:45 +02:00