summaryrefslogtreecommitdiffstats
path: root/Core/Encoder/EncoderFactory.php
diff options
context:
space:
mode:
authorFabien Potencier <fabien.potencier@gmail.com>2014-01-07 14:28:54 +0100
committerFabien Potencier <fabien.potencier@gmail.com>2014-01-07 14:28:54 +0100
commit9e75ce1a4d32e8309e6c50ec539f7105969b8e1e (patch)
tree1006d0b040dac3367806edd4ebf11f56073015da /Core/Encoder/EncoderFactory.php
parentb1021ae160f5425986dea2b62d3f14a0bbbf448a (diff)
parentbcdebea77d289cc60ca17f135edd6cd95f4991fa (diff)
downloadsymfony-security-9e75ce1a4d32e8309e6c50ec539f7105969b8e1e.zip
symfony-security-9e75ce1a4d32e8309e6c50ec539f7105969b8e1e.tar.gz
symfony-security-9e75ce1a4d32e8309e6c50ec539f7105969b8e1e.tar.bz2
Merge branch '2.3' into 2.4
* 2.3: update year on licenses rundown and typo fix [Process] Fix #9861 : Revert TTY mode [Form] Update minimal requirement in composer.json Fix Empty translations with Qt files Update UPGRADE-2.3.md to account for #9388 Conflicts: src/Symfony/Component/Validator/Tests/Constraints/LessThanValidatorTest.php
Diffstat (limited to 'Core/Encoder/EncoderFactory.php')
0 files changed, 0 insertions, 0 deletions