diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-11-03 15:29:13 +0100 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-11-03 15:29:13 +0100 |
| commit | 969128c31e439d0d56ff99322806e9d56923149a (patch) | |
| tree | 7cded2974fbd020bd50904e467b28fe78295fbbd /Core/Encoder/EncoderFactoryInterface.php | |
| parent | 3ebe37fa9b133e4b9b0d784de95124e2af66f820 (diff) | |
| parent | f55a6fe9007b58469670ecd74c1b8121a31c94c5 (diff) | |
| download | symfony-security-969128c31e439d0d56ff99322806e9d56923149a.zip symfony-security-969128c31e439d0d56ff99322806e9d56923149a.tar.gz symfony-security-969128c31e439d0d56ff99322806e9d56923149a.tar.bz2 | |
Merge branch '2.8'
* 2.8:
[Security] Clean deps
[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