diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-11-03 15:28:10 +0100 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-11-03 15:28:10 +0100 |
| commit | f55a6fe9007b58469670ecd74c1b8121a31c94c5 (patch) | |
| tree | 2cb6abc0884a36925e4012abe5f4393788a0a386 /Core/Encoder/EncoderFactoryInterface.php | |
| parent | aa593444fb4e3acc09351939cf0dca50d0e92522 (diff) | |
| parent | b56511b65e2fb12a0415863bc829d0ae98fe3e5b (diff) | |
| download | symfony-security-f55a6fe9007b58469670ecd74c1b8121a31c94c5.zip symfony-security-f55a6fe9007b58469670ecd74c1b8121a31c94c5.tar.gz symfony-security-f55a6fe9007b58469670ecd74c1b8121a31c94c5.tar.bz2 | |
Merge branch '2.7' into 2.8
* 2.7:
[Security][2.7] Clean deps
[HttpKernel] Fix time-sensitive test case
[travis] Fail early when an invalid composer.json is found
Conflicts:
src/Symfony/Component/Security/Core/composer.json
src/Symfony/Component/Security/composer.json
Diffstat (limited to 'Core/Encoder/EncoderFactoryInterface.php')
0 files changed, 0 insertions, 0 deletions