Fabien Potencier
|
67d9253127
|
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
|
2012-10-24 17:41:27 +02:00 |
|