Merge branch '4.0'

This commit is contained in:
Benoît Burnichon
2016-03-16 17:21:57 +01:00
29 changed files with 668 additions and 464 deletions

View File

@@ -28,7 +28,8 @@
}
],
"require": {
"php": ">=5.5",
"php": ">=5.5.9",
"ext-intl": "*",
"alchemy-fr/tcpdf-clone": "~6.0",
"alchemy/embed-bundle": "^0.3.2",
"alchemy/geonames-api-consumer": "~0.1.0",
@@ -42,6 +43,7 @@
"alchemy/task-manager": "2.0.x-dev@dev",
"alchemy/zippy": "^0.3.0",
"beberlei/assert": "^2.3",
"cocur/slugify": "^2.0",
"dailymotion/sdk": "~1.5",
"data-uri/data-uri": "~0.1.0",
"dflydev/doctrine-orm-service-provider": "~1.0",