Skip to content

Commit

Permalink
Merge branch '2.8'
Browse files Browse the repository at this point in the history
* 2.8:
  [Bundle\Twig] Fix lowet form dep

Conflicts:
	src/Symfony/Bridge/Twig/composer.json
  • Loading branch information
nicolas-grekas committed Nov 28, 2015
2 parents e740453 + 744862a commit 5385e52
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -22,7 +22,7 @@
"require-dev": {
"symfony/asset": "~2.8|~3.0",
"symfony/finder": "~2.8|~3.0",
"symfony/form": "~2.8|~3.0",
"symfony/form": "~2.8,>2.8-BETA1|~3.0,>3.0-BETA1",
"symfony/http-kernel": "~2.8|~3.0",
"symfony/polyfill-intl-icu": "~1.0",
"symfony/routing": "~2.8|~3.0",
Expand Down

0 comments on commit 5385e52

Please sign in to comment.