diff options
author | Fabien Potencier <fabien.potencier@gmail.com> | 2012-12-11 11:33:11 +0100 |
---|---|---|
committer | Fabien Potencier <fabien.potencier@gmail.com> | 2012-12-11 11:33:11 +0100 |
commit | cd62a1fb293e48ce01a292321b1bc48c1db89723 (patch) | |
tree | e721a874a573411a7bb68545b13f110e4445f49d /Http/Authentication/DefaultAuthenticationSuccessHandler.php | |
parent | 547b1b0225cd1d9561f370a7efd4b76f0f9260f3 (diff) | |
parent | 75afdfe4132703fcb652d6e4aecafbe2785fcfe4 (diff) | |
download | symfony-security-cd62a1fb293e48ce01a292321b1bc48c1db89723.zip symfony-security-cd62a1fb293e48ce01a292321b1bc48c1db89723.tar.gz symfony-security-cd62a1fb293e48ce01a292321b1bc48c1db89723.tar.bz2 |
Merge branch '2.0' into 2.1
* 2.0:
fixed CS
removed the Travis icon (as this is not stable enough -- many false positive, closes #6186)
[Config] Loader::import must return imported data
[HttpFoundation] fixed a small regression
Conflicts:
README.md
src/Symfony/Bridge/Twig/Extension/FormExtension.php
src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/attributes.html.php
src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/form_widget.html.php
src/Symfony/Bundle/FrameworkBundle/Templating/Helper/FormHelper.php
src/Symfony/Component/Form/Form.php
src/Symfony/Component/HttpFoundation/Request.php
src/Symfony/Component/HttpFoundation/SessionStorage/PdoSessionStorage.php
tests/Symfony/Tests/Bridge/Doctrine/Logger/DbalLoggerTest.php
Diffstat (limited to 'Http/Authentication/DefaultAuthenticationSuccessHandler.php')
0 files changed, 0 insertions, 0 deletions