diff options
| author | Nicolas Grekas <nicolas.grekas@gmail.com> | 2016-02-02 10:49:18 +0100 |
|---|---|---|
| committer | Nicolas Grekas <nicolas.grekas@gmail.com> | 2016-02-02 10:49:18 +0100 |
| commit | 91000c56750620d8bdb614057d8a17707854c8c3 (patch) | |
| tree | abf7b85f0539287d585b774dcc52a368cc8b8cd8 /Core/Encoder/PasswordEncoderInterface.php | |
| parent | ec26f8ebb56b3819fc8d785a45254703b2f3b330 (diff) | |
| parent | ef02544c8cd8f7c2dfc7d463a4469e86e1c99064 (diff) | |
| download | symfony-security-91000c56750620d8bdb614057d8a17707854c8c3.zip symfony-security-91000c56750620d8bdb614057d8a17707854c8c3.tar.gz symfony-security-91000c56750620d8bdb614057d8a17707854c8c3.tar.bz2 | |
Merge branch '2.7' into 2.8
* 2.7:
[Console] Add missing `@require` annotation in test
Fix merge
[appveyor] Fix failure reporting
[#17634] move DebugBundle license file
backport GlobTest from 2.7 branch
Move licenses according to new best practices
[FrameworkBundle] Remove unused code in test
[2.3] Fixed an undefined variable in Glob::toRegex
simplified a test
fix container cache key generation
[Form] fix option name in changelog
[Translation] Add resources from fallback locale
[DependencyInjection] enforce tags to have a name
[YAML] Refine the return value of Yaml::parse()
Conflicts:
src/Symfony/Component/DependencyInjection/Tests/Loader/YamlFileLoaderTest.php
Diffstat (limited to 'Core/Encoder/PasswordEncoderInterface.php')
0 files changed, 0 insertions, 0 deletions