Merge pull request #12 from faouzic/feature/26106

[FEATURE#26106] V2
etna-alternance · Mar 14, 2016 · fe1493e · fe1493e
2 parents 7c16314 + e1179db
commit fe1493e
Show file tree

Hide file tree

Showing 3 changed files with 155 additions and 146 deletions.
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
     ],
     "require": {
         "php": ">=5.5.0",
-        "silex/silex": "1.x",
+        "silex/silex": "~2.0@dev",
         "guzzle/guzzle": "3.9.x"
     },
     "autoload": {