diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2013-01-08 19:17:41 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2013-01-08 19:17:41 +0100 |
| commit | 5f1f30e85559ca00e1816bd62d33706a6f90f86d (patch) | |
| tree | 037a49ecaea7f69251fcd93a40293d7ca28c7059 /Core/Encoder/EncoderFactoryInterface.php | |
| parent | 83f4684445473c3a05dc0e06a2b74db3b5626a65 (diff) | |
| parent | fe15d89a161b1f189c5f12df9e97abbbe8937dba (diff) | |
| download | symfony-security-5f1f30e85559ca00e1816bd62d33706a6f90f86d.zip symfony-security-5f1f30e85559ca00e1816bd62d33706a6f90f86d.tar.gz symfony-security-5f1f30e85559ca00e1816bd62d33706a6f90f86d.tar.bz2 | |
Merge branch '2.1'
* 2.1:
[Console] Fix style escaping parsing
[Console] Make style formatter matching less greedy to avoid having to escape when not needed
[Bundle] [FrameworkBundle] fixed indentation in esi.xml services file.
[Component] [Security] fixed PSR-2 coding violation in ClassUtilsTest class.
[Form] Fixed EntityChoiceList when loading objects with negative integer IDs
[TwigBundle] There is no CSS visibility of display, should be visible instead
[Form] corrected source node for a Danish translation
[DependencyInjection] fixed a bug where the strict flag on references were lost (closes #6607)
[HttpFoundation] Check if required shell functions for `FileBinaryMimeTypeGuesser` are not disabled
[CssSelector] added css selector with empty string
[HttpFoundation] Docblock for Request::isXmlHttpRequest() now points to Wikipedia
[DependencyInjection] refactored code to avoid logic duplication
[Form] Deleted references in FormBuilder::getFormConfig() to improve performance
[HttpFoundation] Update docblock for non-working method
Conflicts:
src/Symfony/Bundle/TwigBundle/Resources/views/Exception/trace.html.twig
src/Symfony/Bundle/TwigBundle/Resources/views/Exception/traces.html.twig
Diffstat (limited to 'Core/Encoder/EncoderFactoryInterface.php')
0 files changed, 0 insertions, 0 deletions