Merge branch 'develop'

2017-12-12 16:35:45 -08:00 · 2017-12-12 16:35:45 -08:00 · 8e8d9118e9
commit 8e8d9118e9
parent a85d5cfe92 9c108873e9
3 changed files with 270 additions and 193 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -13,6 +13,8 @@ services:
 php:
  - 5.6
  - 7.0
+  - 7.2
+  - 7.1.4

 # execute any number of scripts before the test run, custom env's are available as variables
 before_script:
--- a/composer.json
+++ b/composer.json
@ -16,7 +16,7 @@
    "fideloper/proxy": "^3.1",
    "intervention/image": "^2.3",
    "javiereguiluz/easyslugger": "^1.0",
-    "laravel/framework": "5.4.29",
+    "laravel/framework": "5.4.35",
    "laravel/passport": "^3.0",
    "laravel/tinker": "^1.0",
    "laravelcollective/html": "^5.3",
--- a/composer.lock
+++ b/composer.lock