Merge branch 'master' into develop

This commit is contained in:
Taylor Otwell
2018-02-07 09:37:45 -06:00
4 changed files with 39 additions and 3 deletions

View File

@@ -15,7 +15,7 @@
"popper.js": "^1.12",
"cross-env": "^5.1",
"jquery": "^3.2",
"laravel-mix": "^1.0",
"laravel-mix": "^2.0",
"lodash": "^4.17.4",
"vue": "^2.5.7"
}