diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.4'

Browse Source 
* 3.4:
  fix bad merge
This commit is contained in:
Nicolas Grekas 2017-08-07 20:33:48 +02:00
commit 6d71b7712c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Symfony/Bundle/TwigBundle/composer.json
View File

@ -17,11 +17,11 @@
], ],
"require": { "require": {
"php": "^7.1.3", "php": "^7.1.3",
"symfony/config": "~3.2", "symfony/config": "~3.4|~4.0",
"symfony/twig-bridge": "^3.3", "symfony/twig-bridge": "~3.4|~4.0",
"symfony/http-foundation": "~2.8|~3.0", "symfony/http-foundation": "~3.4|~4.0",
"symfony/http-kernel": "^3.3", "symfony/http-kernel": "~3.4|~4.0",
"twig/twig": "~1.34|~2.4" "twig/twig": "~3.4|~4.0"
}, },
"require-dev": { "require-dev": {
"symfony/asset": "~3.4|~4.0", "symfony/asset": "~3.4|~4.0",