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 2f3692aca7 Merge branch '2.3' into 2.6 ... * 2.3: Minor hot fix [PROCESS] make sure /dev/tty is readable [2.3] require-dev PHPUnit bridge [FrameworkBundle] Fixed Shell logo [2.3] Update CONTRIBUTING.md [2.3][Process] Fixed PhpProcess::getCommandLine() result [Console] explicit assertion for ArgvInput::getFirstArgument() with no arguments Enforce UTF-8 charset for core controllers Conflicts: CONTRIBUTING.md src/Symfony/Bridge/Monolog/composer.json src/Symfony/Bundle/FrameworkBundle/composer.json src/Symfony/Bundle/SecurityBundle/composer.json src/Symfony/Bundle/TwigBundle/Controller/ExceptionController.php src/Symfony/Bundle/WebProfilerBundle/Controller/ProfilerController.php src/Symfony/Component/Console/composer.json src/Symfony/Component/Debug/composer.json src/Symfony/Component/DomCrawler/composer.json src/Symfony/Component/EventDispatcher/composer.json src/Symfony/Component/HttpFoundation/composer.json src/Symfony/Component/Security/composer.json src/Symfony/Component/Templating/composer.json		2015-02-24 12:52:21 +01:00
..
Descriptor	Merge branch '2.5' into 2.6	2015-01-15 13:15:12 +01:00
Helper	[2.6] Added internal annotation on Descriptor classes	2015-01-05 22:39:05 +01:00
Application.php	Merge branch '2.3' into 2.5	2014-12-02 21:15:53 +01:00
Shell.php	[FrameworkBundle] Fixed Shell logo	2015-02-24 11:23:15 +01:00