diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2012-12-06 08:52:34 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2012-12-06 08:52:34 +0100 |
| commit | 776462d0999054c52084f4c529606103bcccd8b3 (patch) | |
| tree | b0aab5e5f5ab5279a094beb0e6166ad9d075f6ea /Core/Encoder/EncoderFactoryInterface.php | |
| parent | d89a11e10ba2a8b4c105232dcd33de8d3543b5aa (diff) | |
| parent | ffc4cd248448d68d0d140af6cf65ec2f007a6158 (diff) | |
| download | symfony-security-776462d0999054c52084f4c529606103bcccd8b3.zip symfony-security-776462d0999054c52084f4c529606103bcccd8b3.tar.gz symfony-security-776462d0999054c52084f4c529606103bcccd8b3.tar.bz2 | |
Merge branch '2.1'
* 2.1:
[Locale] fixed tests
[Config] Fixed tests on Windows
[TwigBundle] Fixed tests
[Security] Move DigestDataTest.php inside the Security component
Fixed DefaultValue for session.auto_start in NodeDefinition
Fix namespace of Validator and BrowserKit Tests
Conflicts:
src/Symfony/Bundle/TwigBundle/Tests/DependencyInjection/TwigExtensionTest.php
src/Symfony/Bundle/TwigBundle/Tests/TwigEngineTest.php
Diffstat (limited to 'Core/Encoder/EncoderFactoryInterface.php')
0 files changed, 0 insertions, 0 deletions