Merge branch 'master' of https://github.com/sellerlabs/illuminated

sellerlabs · Jul 7, 2017 · caceed8 · caceed8
2 parents 1ec792e + c33aef0
commit caceed8
Show file tree

Hide file tree

Showing 10 changed files with 160 additions and 1,176 deletions.
diff --git a/composer.json b/composer.json
@@ -21,20 +21,19 @@
   "minimum-stability": "stable",
   "name": "sellerlabs/illuminated",
   "require": {
-    "illuminate/auth": "^5.3",
-    "illuminate/contracts": "^5.3",
-    "illuminate/database": "^5.3",
-    "illuminate/session": "^5.3",
-    "illuminate/support": "^5.3",
-    "illuminate/view": "^5.3",
+    "illuminate/auth": "^5.4",
+    "illuminate/contracts": "^5.4",
+    "illuminate/database": "^5.4",
+    "illuminate/session": "^5.4",
+    "illuminate/support": "^5.4",
+    "illuminate/view": "^5.4",
     "league/commonmark": "^0.12",
     "sellerlabs/nucleus": "~0.5.0",
-    "tijsverkoyen/css-to-inline-styles": "~1.5",
     "vlucas/phpdotenv": "~2.0"
   },
   "require-dev": {
     "doctrine/dbal": "~2.3",
-    "laravel/framework": "^5.3",
+    "laravel/framework": "^5.4",
     "mockery/mockery": "0.9.*@dev",
     "phpunit/phpunit": "~4.6@dev"
   }