Merge pull request #199 from andrewelkins/patch-1

Update to use Laravel 5 development
Zizaco · Sep 26, 2014 · 04f6f35 · 04f6f35
2 parents e3145e2 + cbabd04
commit 04f6f35
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/composer.json b/composer.json
@@ -15,13 +15,13 @@
     ],
     "require": {
         "php": ">=5.4.0",
-        "illuminate/support": "~4.0|~5.0",
+        "illuminate/support": "~4.0|5.0.*@dev",
         "laravelbook/ardent": "~2.4"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.0",
         "mockery/mockery": "~0.9",
-        "illuminate/database": "~4.0",
+        "illuminate/database": "~4.0|5.0.*@dev",
         "symfony/process": "~2.3"
     },
     "repositories": [
@@ -56,7 +56,8 @@
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.2-dev"
+            "dev-master": "1.3-dev"
         }
-    }
+    },
+    "minimum-stability": "dev"
 }