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.
symfony/src/Symfony/Bundle/FrameworkBundle/Resources/views
Nicolas Grekas fc939580ab Merge branch '2.3' into 2.7
* 2.3:
  [travis] Add some comments
  changed operator from and to &&

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Resources/views/Form/choice_widget_collapsed.html.php
2016-02-04 13:09:54 +01:00
..
Form Merge branch '2.3' into 2.7 2016-02-04 13:09:54 +01:00
FormTable [FrameworkBundle] Remove invalid markup 2014-09-10 15:06:13 +02:00