diff options
author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-01-07 15:31:37 +0100 |
---|---|---|
committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-01-07 15:31:37 +0100 |
commit | 73461e3f87d84dd07792abbb7acfd7c1cd99aefd (patch) | |
tree | a84f525bbec2a873256daf9e6acbc74a3e0a85ea /Core/Tests/Encoder/BCryptPasswordEncoderTest.php | |
parent | 177960dbfb60771cabbafff1fa570f981b509009 (diff) | |
parent | dc446ba3c9a71c06fea50ff71c0459899c23e237 (diff) | |
download | symfony-security-73461e3f87d84dd07792abbb7acfd7c1cd99aefd.zip symfony-security-73461e3f87d84dd07792abbb7acfd7c1cd99aefd.tar.gz symfony-security-73461e3f87d84dd07792abbb7acfd7c1cd99aefd.tar.bz2 |
Merge branch '2.5' into 2.6v2.6.3
* 2.5:
bumped Symfony version to 2.5.10
updated VERSION for 2.5.9
updated CHANGELOG for 2.5.9
bumped Symfony version to 2.3.25
updated VERSION for 2.3.24
update CONTRIBUTORS for 2.3.24
Removed unneeded version requirements
updated CHANGELOG for 2.3.24
fixed tests
[Security] Don't destroy the session on buggy php releases.
Conflicts:
src/Symfony/Component/HttpKernel/Kernel.php
Diffstat (limited to 'Core/Tests/Encoder/BCryptPasswordEncoderTest.php')
0 files changed, 0 insertions, 0 deletions