Merge 4.0 into master

This commit is contained in:
Thibaud Fabre
2016-12-06 14:45:57 +01:00

View File

@@ -56,7 +56,7 @@
"doctrine/migrations": "^1.0.0",
"doctrine/orm": "^2.4.0",
"elasticsearch/elasticsearch": "~2.0",
"facebook/php-sdk": "~3.0",
"facebook/php-sdk": "~4.0.1",
"firebase/php-jwt": "^3.0.0",
"gedmo/doctrine-extensions": "~2.3.0",
"goodby/csv": "^1.3.0",