diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-02-24 12:52:21 +0100 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-02-24 12:52:21 +0100 |
| commit | b4d7bfbd51e8ce9b7cc91aac2dccfa1b3fd731a9 (patch) | |
| tree | bd57c6dfe7fa6e49c2a1507dc3a99bf79ab44bb6 /Core/Authentication | |
| parent | ef7b49e118ca2a22eae5348ccb79715d49c473f8 (diff) | |
| parent | 5d5a4e20a8f5db004e045a5b8137a6d455272ee4 (diff) | |
| download | symfony-security-b4d7bfbd51e8ce9b7cc91aac2dccfa1b3fd731a9.zip symfony-security-b4d7bfbd51e8ce9b7cc91aac2dccfa1b3fd731a9.tar.gz symfony-security-b4d7bfbd51e8ce9b7cc91aac2dccfa1b3fd731a9.tar.bz2 | |
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
Diffstat (limited to 'Core/Authentication')
0 files changed, 0 insertions, 0 deletions