Merge branch '2.7'

Browse Source

* 2.7:
  [Form] Add conflict with symfony/twig-bridge <2.7

Conflicts:
	src/Symfony/Component/Form/composer.json

...

This commit is contained in:

Nicolas Grekas 2015-04-06 14:31:59 +02:00

parent a5e05d2b7d 1d5f786a6b

commit 8d098e5682

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available