Merge branch 'master' into master

This commit is contained in:
Ben Word
2018-08-21 15:30:05 -06:00
committed by GitHub
34 changed files with 8073 additions and 5850 deletions

View File

@@ -32,10 +32,10 @@
}
},
"require": {
"php": ">=7",
"php": ">=7.1",
"composer/installers": "~1.0",
"illuminate/support": "~5.4",
"roots/sage-lib": "~9.0.0-beta.4",
"illuminate/support": "~5.6",
"roots/sage-lib": "~9.0.1",
"soberwp/controller": "~2.1.0"
},
"require-dev": {