Merge branch 'develop'

OFFLINE-GmbH · Aug 2, 2016 · 31e2f15 · 31e2f15
2 parents 7437581 + eb0cfac
commit 31e2f15
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 39 deletions.
diff --git a/composer.json b/composer.json
@@ -16,14 +16,14 @@
   "require": {
     "guzzlehttp/guzzle": "~6.0",
     "cypresslab/gitelephant": "~1.1",
-    "symfony/console": "~2.7",
-    "symfony/process": "~2.7",
+    "symfony/console": "~2.7|~3.0",
+    "symfony/process": "~2.7|~3.0",
     "symfony/yaml": "~2.1|~3.0"
   },
   "bin": [
     "october"
   ],
   "require-dev": {
-    "symfony/var-dumper": "~2.7"
+    "symfony/var-dumper": "~2.7|~3.0"
   }
 }
diff --git a/composer.lock b/composer.lock