diff options
| author | Fabien Potencier <fabien.potencier@gmail.com> | 2012-10-24 17:41:27 +0200 |
|---|---|---|
| committer | Fabien Potencier <fabien.potencier@gmail.com> | 2012-10-24 17:41:27 +0200 |
| commit | e3d359180c41a80803e06a5d277b3b319952c8ee (patch) | |
| tree | 07c8f9edcd909eb7a049cc8f4faa4feb25f29d13 /Core/Encoder | |
| parent | c8eee73f855b1c1b0af8f6292c7f291866d06b21 (diff) | |
| parent | 3d287a5e46b6c915449616b1800e1984dbd83966 (diff) | |
| download | symfony-security-e3d359180c41a80803e06a5d277b3b319952c8ee.zip symfony-security-e3d359180c41a80803e06a5d277b3b319952c8ee.tar.gz symfony-security-e3d359180c41a80803e06a5d277b3b319952c8ee.tar.bz2 | |
Merge branch '2.1'
* 2.1:
added missing use statment (closes #5825)
Code cleanup
[WebProfilerBundle] Fixed the use of nested macros
Removed unused use statements.
Nsdocblocks
[ConfigDumpReference] avoid notice for variable nodes
fixed fallback locale
UniqueValidatorTest, Change message on assertions
Documented removed _form_is_choice_group function
Conflicts:
src/Symfony/Bundle/FrameworkBundle/Command/ConfigDumpReferenceCommand.php
src/Symfony/Bundle/WebProfilerBundle/Profiler/TemplateManager.php
Diffstat (limited to 'Core/Encoder')
0 files changed, 0 insertions, 0 deletions