diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-10-06 17:02:37 +0200 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-10-06 17:02:37 +0200 |
| commit | 13818e3015a2a20025ae65b6f57756795eaeda7e (patch) | |
| tree | 875ffb31dee3f8fc2da2d088b23da165678e9863 /Http/Authentication/SimplePreAuthenticatorInterface.php | |
| parent | 504009d8080efa7da58eaeab84d905912aeb298e (diff) | |
| parent | cf43cdc943cd403996ba6924031658b7bf2998e2 (diff) | |
| download | symfony-security-13818e3015a2a20025ae65b6f57756795eaeda7e.zip symfony-security-13818e3015a2a20025ae65b6f57756795eaeda7e.tar.gz symfony-security-13818e3015a2a20025ae65b6f57756795eaeda7e.tar.bz2 | |
Merge branch '2.3' into 2.7
Conflicts:
src/Symfony/Bundle/FrameworkBundle/DependencyInjection/FrameworkExtension.php
src/Symfony/Bundle/FrameworkBundle/Tests/DependencyInjection/FrameworkExtensionTest.php
src/Symfony/Component/Security/Tests/Core/SecurityContextTest.php
Diffstat (limited to 'Http/Authentication/SimplePreAuthenticatorInterface.php')
0 files changed, 0 insertions, 0 deletions