diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2014-10-24 07:49:22 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2014-10-24 07:49:22 +0200 |
| commit | 533f832af99e32dd74d7e3a7d6a3857c3d149614 (patch) | |
| tree | 8b453940222c8846b0f2d20a490f8cc15d812b48 /Core/Tests/Encoder/BCryptPasswordEncoderTest.php | |
| parent | f9854a99b470ae387d229f200d6b9ee9647c11a0 (diff) | |
| parent | cd022841a94f02dd95541fee4cc4a09c4b053d01 (diff) | |
| download | symfony-security-533f832af99e32dd74d7e3a7d6a3857c3d149614.zip symfony-security-533f832af99e32dd74d7e3a7d6a3857c3d149614.tar.gz symfony-security-533f832af99e32dd74d7e3a7d6a3857c3d149614.tar.bz2 | |
Merge branch '2.3' into 2.5v2.5.6
* 2.3:
enforce memcached version to be 2.1.0
[FrameworkBundle] improve server:run feedback
[Form] no need to add the url listener when it does not do anything
[Form] Fix #11694 - Enforce options value type check in some form types
Lithuanian security translations
[Router] Cleanup
[FrameworkBundle] Fixed ide links
Add missing argument
[TwigBundle] do not pass a template reference to twig
[TwigBundle] show correct fallback exception template in debug mode
[TwigBundle] remove unused email placeholder from error page
use meta charset in layouts without legacy http-equiv
Conflicts:
src/Symfony/Bundle/TwigBundle/Loader/FilesystemLoader.php
src/Symfony/Bundle/TwigBundle/Resources/views/layout.html.twig
Diffstat (limited to 'Core/Tests/Encoder/BCryptPasswordEncoderTest.php')
0 files changed, 0 insertions, 0 deletions