Merge branch '2.0'

* 2.0:
  [TwigBridge] changed composer.json max version for Twig
  use the forward compat version in the Filesystem service
This commit is contained in:
Fabien Potencier 2011-12-27 12:11:56 +01:00
commit e10448e9ea

View File

@ -18,7 +18,7 @@
],
"require": {
"php": ">=5.3.2",
"twig/twig": ">=1.1,<1.5-dev"
"twig/twig": ">=1.1,<2.0-dev"
},
"suggest": {
"symfony/form": "self.version",