Merge branch '3.1'
* 3.1: Fix deps merge
This commit is contained in:
commit
870c302199
@ -18,7 +18,7 @@
|
||||
"require": {
|
||||
"php": ">=5.5.9",
|
||||
"symfony/event-dispatcher": "~2.8|~3.0",
|
||||
"symfony/http-foundation": "~2.8.13|~3.0.8|~3.1.2|~3.2",
|
||||
"symfony/http-foundation": "~2.8.13|~3.1.6|~3.2",
|
||||
"symfony/debug": "~2.8|~3.0",
|
||||
"psr/log": "~1.0"
|
||||
},
|
||||
|
Reference in New Issue
Block a user