diff options
author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-12-18 16:38:35 +0100 |
---|---|---|
committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2015-12-18 16:38:35 +0100 |
commit | 9419b7b165f5f068c0d87dcb344781bc03ede87b (patch) | |
tree | 3a0d6c0d8b52a7b30503e118f8241d4fd1a19eb7 /Core/Encoder/BasePasswordEncoder.php | |
parent | cb6ed1127a7d17612e1deb4996f3115a94012fe5 (diff) | |
parent | 9685b588a8a11822620871472fe46ff7a9fe483c (diff) | |
download | symfony-security-9419b7b165f5f068c0d87dcb344781bc03ede87b.zip symfony-security-9419b7b165f5f068c0d87dcb344781bc03ede87b.tar.gz symfony-security-9419b7b165f5f068c0d87dcb344781bc03ede87b.tar.bz2 |
Merge branch '2.7' into 2.8
* 2.7:
prefer phpunit 5.x on hhvm
[FrameworkBundle][HttpKernel] the finder is required to discover bundle commands
[travis] Auto-conf deps=high matrix line
Fix the logout path when not using the router
Fix the logout path when not using the router
[Form] cast IDs to match deprecated behaviour of EntityChoiceList
[HttpFoundation] Added the ability of mapping stream wrapper protocols when using X-Sendfile
[HttpFoundation] Add a test case for using BinaryFileResponse with stream wrappers
Conflicts:
.travis.yml
src/Symfony/Bundle/FrameworkBundle/composer.json
Diffstat (limited to 'Core/Encoder/BasePasswordEncoder.php')
0 files changed, 0 insertions, 0 deletions