Merge branch '2.7'

Browse Source

* 2.7:
  [TwigBundle] made AppVariable compatible with 3.0
  fixed error message

Conflicts:
	src/Symfony/Bridge/Twig/AppVariable.php

...

This commit is contained in:

Fabien Potencier 2015-01-25 03:42:07 +01:00

parent f712a330c8 c5407f1cde

commit 312dbedf9d

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