diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2013-12-29 21:33:52 +0100 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2013-12-29 21:33:52 +0100 |
| commit | 763b54967bf8bd0798bab530df38ec6b695d2d49 (patch) | |
| tree | 0a19770e74d81c0d62ffeb1a6cfaf60a2acfcf90 /Core/Encoder/EncoderFactoryInterface.php | |
| parent | bfa00f76487ab8df6967cba49dc4cbbf3a28477c (diff) | |
| parent | 2edf1f33f7595aec863d3b23147ce389c50a7cf5 (diff) | |
| download | symfony-security-763b54967bf8bd0798bab530df38ec6b695d2d49.zip symfony-security-763b54967bf8bd0798bab530df38ec6b695d2d49.tar.gz symfony-security-763b54967bf8bd0798bab530df38ec6b695d2d49.tar.bz2 | |
Merge branch '2.3' into 2.4
* 2.3:
fix some cs
use restore_error_handler instead of set_error_handler($previous)
fix #9321 Crawler::addHtmlContent add gbk encoding support
[Console] fixed column width when using the Table helper with some decoration in cells
[Security] Fixed problem with losing ROLE_PREVIOUS_ADMIN role.
Fix for cache-key conflict when having a \Traversable as choices
[Security] removed obsolete comment
Conflicts:
src/Symfony/Component/Console/Helper/TableHelper.php
src/Symfony/Component/Security/Tests/Http/Firewall/ExceptionListenerTest.php
Diffstat (limited to 'Core/Encoder/EncoderFactoryInterface.php')
0 files changed, 0 insertions, 0 deletions