Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/eslint-plugin-vue-7.5.0
Browse files Browse the repository at this point in the history
  • Loading branch information
codeitlikemiley authored Jan 22, 2021
2 parents c2ebb38 + 12ed034 commit a2a8d8a
Show file tree
Hide file tree
Showing 2 changed files with 69 additions and 165 deletions.
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,22 @@
"@inertiajs/inertia-vue": "^0.1.4",
"@inertiajs/progress": "^0.1.2",
"@mdi/font": "^4.9.95",
"@mdi/js": "^4.9.95",
"@mdi/js": "^5.9.55",
"browser-sync": "^2.26.13",
"browser-sync-webpack-plugin": "^2.3.0",
"cross-env": "^6.0.3",
"cross-env": "^7.0.3",
"deepmerge": "^4.2.2",
"eslint-plugin-import": "^2.19.1",
"eslint-plugin-vue": "^7.5.0",
"fibers": "^4.0.3",
"fibers": "^5.0.0",
"font-awesome": "^4.7.0",
"laravel-mix": "5.0.1",
"laravel-mix": "5.0.9",
"lodash": "^4.17.20",
"material-design-icons-iconfont": "^5.0.1",
"material-design-icons-iconfont": "^6.1.0",
"resolve-url-loader": "^3.1.2",
"roboto-fontface": "^0.10.0",
"sass": "^1.32.4",
"sass-loader": "^8.0.2",
"sass-loader": "^10.1.1",
"vue": "^2.6.11",
"vue-template-compiler": "^2.6.11",
"vuetify": "^2.4.2",
Expand All @@ -44,7 +44,7 @@
"install": "^0.13.0",
"laravel-echo": "^1.10.0",
"npm": "^6.14.11",
"object-to-formdata": "^2.3.1",
"object-to-formdata": "^4.1.0",
"pusher-js": "^7.0.2",
"sweetalert2": "^9.17.2",
"vee-validate": "^2.2.15",
Expand Down
Loading

0 comments on commit a2a8d8a

Please sign in to comment.