fix merge
This commit is contained in:
parent
78ebc6d5ce
commit
52e9f836b3
@ -20,6 +20,7 @@
|
|||||||
"symfony/polyfill-mbstring": "~1.1"
|
"symfony/polyfill-mbstring": "~1.1"
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
|
"predis/predis": "~1.0",
|
||||||
"symfony/expression-language": "~3.4|~4.0"
|
"symfony/expression-language": "~3.4|~4.0"
|
||||||
},
|
},
|
||||||
"autoload": {
|
"autoload": {
|
||||||
|
Reference in New Issue
Block a user