Merge branch '3.4'
* 3.4: Fix merge
This commit is contained in:
commit
145587c614
@ -33,7 +33,7 @@
|
||||
"symfony/http-kernel": "~3.4|~4.0",
|
||||
"symfony/security-csrf": "~3.4|~4.0",
|
||||
"symfony/translation": "~3.4|~4.0",
|
||||
"symfony/var-dumper": "~3.4-beta3|~4.0"
|
||||
"symfony/var-dumper": "~3.4-beta3|~4.0-beta3"
|
||||
},
|
||||
"conflict": {
|
||||
"phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0",
|
||||
|
Reference in New Issue
Block a user