diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-01-25 05:37:39 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-01-25 05:37:39 +0100 |
| commit | 4cf41cef4ad7377ea89fb3856e2b07b925aa15cf (patch) | |
| tree | 2b23747f8d2618c9020dcc340f1d7b3f2586a004 /Http/Tests/Authentication/DefaultAuthenticationSuccessHandlerTest.php | |
| parent | d5541a8851c283d068d46c0d116aaeeb672abc64 (diff) | |
| parent | ad78f5a640b515579db750d4f87dc9169dd4b9e3 (diff) | |
| download | symfony-security-origin/2.5.zip symfony-security-origin/2.5.tar.gz symfony-security-origin/2.5.tar.bz2 | |
Merge branch '2.3' into 2.5v2.5.12v2.5.11v2.5.10origin/2.5
* 2.3:
[2.3] [HttpFoundation] [MimeTypeGuesser]
Removed dead code and various cleaning
[Console] Make it clear that the second argument is not about command options.
Added the '-' character for spaceless on tag start and end to be consistent for block, if, set and for nodes
[Yaml] fixed parse shortcut Key after unindented collection.
[Console] fixed #10531
Make the container considered non-fresh if the environment parameters are changed
Conflicts:
src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
src/Symfony/Bridge/Twig/Resources/views/Form/form_table_layout.html.twig
src/Symfony/Component/Console/Tests/ApplicationTest.php
src/Symfony/Component/Security/Core/Authentication/Provider/PreAuthenticatedAuthenticationProvider.php
Diffstat (limited to 'Http/Tests/Authentication/DefaultAuthenticationSuccessHandlerTest.php')
0 files changed, 0 insertions, 0 deletions