Merge branch '2.7'

Browse Source

* 2.7:
  [TwigBundle] Require symfony/http-kernel < 3.0

Conflicts:
	src/Symfony/Bundle/TwigBundle/composer.json

...

This commit is contained in:

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

parent 3aab145d5d 98c67be970

commit a5e05d2b7d

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