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 a7d52fda77 Merge branch '2.5' ... * 2.5: [FrameworkBundle] minor fix [Console] add a dot [Form] remove unnecessary call clean handling of :: passed to find() Conflicts: src/Symfony/Bundle/FrameworkBundle/Controller/ControllerNameParser.php src/Symfony/Component/Console/Tests/Fixtures/application_1.txt src/Symfony/Component/Console/Tests/Fixtures/application_2.txt src/Symfony/Component/Console/Tests/Fixtures/application_astext1.txt src/Symfony/Component/Console/Tests/Fixtures/application_astext2.txt src/Symfony/Component/Console/Tests/Fixtures/application_gethelp.txt src/Symfony/Component/Console/Tests/Fixtures/application_run1.txt		2014-10-05 15:59:22 +02:00
..
Controller.php	Update the Controller to be consistent	2014-09-26 11:35:02 +10:00
ControllerNameParser.php	Merge branch '2.5'	2014-10-05 15:59:22 +02:00
ControllerResolver.php	fixed CS	2014-06-26 09:13:51 +02: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