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 |
|