diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-04-27 14:43:05 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-04-27 14:43:05 +0200 |
| commit | 79aa4b22c98c732296722724001cc985429f44fb (patch) | |
| tree | 091119a0d518f532abe8d1c743d1380ccdb581d3 /Core/Encoder | |
| parent | 957136819fa019626b0f009152a53d094972bcdf (diff) | |
| parent | 448c71dc654f2996835007f172ead30c742e3921 (diff) | |
| download | symfony-security-79aa4b22c98c732296722724001cc985429f44fb.zip symfony-security-79aa4b22c98c732296722724001cc985429f44fb.tar.gz symfony-security-79aa4b22c98c732296722724001cc985429f44fb.tar.bz2 | |
Merge branch '2.3' into 2.6
* 2.3:
[DependencyInjection] Removed extra strtolower calls
[Validator] Fixed Choice when an empty array is used in the "choices" option
Fixed tests
[StringUtil] Fixed singularification of 'selfies'
Fix Portuguese (Portugal) translation for Security
improved exception when missing required component
CS: unalign =
Show a better error when the port is in use
CS: unalign =>
[FrameworkBundle] Check for 'xlf' instead of 'xliff'
Add better phpdoc message for getListeners method of the EventDispatcher
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Command/ServerRunCommand.php
src/Symfony/Bundle/TwigBundle/Command/LintCommand.php
src/Symfony/Component/DependencyInjection/ContainerBuilder.php
src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services11.php
src/Symfony/Component/Validator/Constraints/ChoiceValidator.php
Diffstat (limited to 'Core/Encoder')
0 files changed, 0 insertions, 0 deletions