Merge branch 'develop' into feature/vuejs

This commit is contained in:
Dane Everitt 2019-03-09 11:19:07 -08:00
commit a66d7a3417
No known key found for this signature in database
GPG key ID: EEA66103B3D71F53
73 changed files with 1867 additions and 558 deletions

View file

@ -21,7 +21,7 @@
"doctrine/dbal": "^2.5",
"fideloper/proxy": "^4.0",
"guzzlehttp/guzzle": "^6.3",
"hashids/hashids": "^2.0",
"hashids/hashids": "^3.0",
"igaster/laravel-theme": "^2.0.6",
"laracasts/utilities": "^3.0",
"laravel/framework": "~5.7.14",
@ -37,8 +37,8 @@
"sofa/eloquence-base": "v5.6.2",
"sofa/eloquence-validable": "v5.6",
"spatie/laravel-fractal": "^5.4",
"webmozart/assert": "^1.2",
"znck/belongs-to-through": "^2.3"
"staudenmeir/belongs-to-through": "~2.3.0",
"webmozart/assert": "^1.2"
},
"require-dev": {
"barryvdh/laravel-debugbar": "^3.2",