Updated packages versions to use dev-master

GrupaZero · Apr 12, 2017 · 9388d9f · 9388d9f
1 parent 986c728
commit 9388d9f
Show file tree

Hide file tree

Showing 2 changed files with 137 additions and 50 deletions.
diff --git a/composer.json b/composer.json
@@ -19,9 +19,9 @@
     "require": {
         "php": ">=7.1.0",
         "laravel/framework": "5.4.*",
-        "gzero/cms": "dev-laravel_5_4_upgrade",
-        "gzero/api": "dev-laravel_5_4_upgrade",
-        "gzero/admin": "dev-laravel_5_4_upgrade",
+        "gzero/cms": "dev-master",
+        "gzero/api": "dev-master",
+        "gzero/admin": "dev-master",
         "predis/predis": "^1.1",
         "league/flysystem-aws-s3-v3": "^1.0"
     },
@@ -31,10 +31,10 @@
         "codeception/codeception": "2.2.*",
         "fzaninotto/faker": "~1.4",
         "mockery/mockery": "0.9.*",
-        "phpunit/phpunit": "~6.0",
+        "phpunit/phpunit": "~5.7",
         "symfony/css-selector": "3.1.*",
         "symfony/dom-crawler": "3.1.*",
-        "satooshi/php-coveralls": "dev-master",
+        "satooshi/php-coveralls": "^1.0",
         "flow/jsonpath": "0.3.*",
         "gzero/testing": "3.*"
     },

diff --git a/composer.lock b/composer.lock