Merge branch 'release/1.2.0'

herpaderpaldent · Aug 1, 2017 · ab1178a · ab1178a
2 parents 63c5de9 + bfc7dd1
commit ab1178a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.1.1
+1.2.0
diff --git a/composer.json b/composer.json
@@ -19,8 +19,8 @@
     "require": {
         "php": ">=5.5.9",
         "cviebrock/discourse-php": "^0.9.3",
-        "illuminate/routing": "5.2.*|5.3.*|5.4.*",
-        "illuminate/support": "5.2.*|5.3.*|5.4.*"
+        "illuminate/routing": "5.2.*|5.3.*|5.4.*|5.5.*",
+        "illuminate/support": "5.2.*|5.3.*|5.4.*|5.5.*"
     },
     "require-dev": {
         "mockery/mockery": "^0.9.1",