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

Update composer.json, conflict with minimum-stability

Author: LaravelDaily

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"