This repository has been archived on 2023-08-20. You can view files and clone it, but cannot push or open issues or pull requests.

Tobias Schultze cbca187a49 Merge branch '2.3' into 2.6 ... Conflicts: src/Symfony/Bridge/Twig/Resources/views/Form/form_div_layout.html.twig src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_collapsed.html.php		2015-06-27 22:15:38 +02:00
..
translations	Merge branch '2.3' into 2.6	2015-06-27 22:15:38 +02:00