fix merge

This commit is contained in:
Nicolas Grekas 2018-02-04 18:35:11 +01:00
parent 78ebc6d5ce
commit 52e9f836b3

View File

@ -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": {