diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2015-01-25 05:39:26 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2015-01-25 05:39:26 +0100 |
| commit | 109e94008f1a0da86d0abd354860b765d569b3c3 (patch) | |
| tree | 504c218f6b483eae6ee5b9d47568dcbcaf1703a6 /Core/Encoder | |
| parent | c58dd27bcc3a9092f2c3156c5bd7ce75c13473c9 (diff) | |
| parent | 4cf41cef4ad7377ea89fb3856e2b07b925aa15cf (diff) | |
| download | symfony-security-109e94008f1a0da86d0abd354860b765d569b3c3.zip symfony-security-109e94008f1a0da86d0abd354860b765d569b3c3.tar.gz symfony-security-109e94008f1a0da86d0abd354860b765d569b3c3.tar.bz2 | |
Merge branch '2.5' into 2.6v2.6.4
* 2.5:
[2.3] [HttpFoundation] [MimeTypeGuesser]
Removed dead code and various cleaning
[Console] Make it clear that the second argument is not about command options.
Added the '-' character for spaceless on tag start and end to be consistent for block, if, set and for nodes
[Yaml] fixed parse shortcut Key after unindented collection.
[Console] fixed #10531
Make the container considered non-fresh if the environment parameters are changed
Conflicts:
src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig
Diffstat (limited to 'Core/Encoder')
0 files changed, 0 insertions, 0 deletions