diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-10-07 12:25:41 +0200 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-10-07 12:25:41 +0200 |
| commit | e91997496707add4092403e341d6be2c7d2139ae (patch) | |
| tree | e590acb0a89bdb6467250826d6af3071ccdbec88 /Http/Authentication/SimpleFormAuthenticatorInterface.php | |
| parent | 1b109f6f25abd0db9ee20fc01f3b51b71d96bcb9 (diff) | |
| parent | 76a58d654dc896281771ac3d40261d4fda9c193f (diff) | |
| download | symfony-security-e91997496707add4092403e341d6be2c7d2139ae.zip symfony-security-e91997496707add4092403e341d6be2c7d2139ae.tar.gz symfony-security-e91997496707add4092403e341d6be2c7d2139ae.tar.bz2 | |
Merge branch '2.8'
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Resources/config/security.xml
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
src/Symfony/Component/Security/Core/composer.json
src/Symfony/Component/Security/Csrf/composer.json
src/Symfony/Component/Security/Http/composer.json
src/Symfony/Component/Security/composer.json
Diffstat (limited to 'Http/Authentication/SimpleFormAuthenticatorInterface.php')
0 files changed, 0 insertions, 0 deletions