Merge pull request #100 from a-bashtannik/patch-1

Update composer.json, conflict with minimum-stability
LaravelDaily · Jan 31, 2017 · 5aa899d · 5aa899d
2 parents 47d1011 + 7eb6d8a
commit 5aa899d
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/composer.json b/composer.json
@@ -14,7 +14,7 @@
   ],
   "version": "2.1.0",
   "require": {
-    "laravel/framework": "5.3.*",
+    "laravel/framework": "5.4.*",
     "laravelcollective/html": "^5.3",
     "intervention/image": "^2.3",
     "yajra/laravel-datatables-oracle": "^6.18"