Skip to content

Commit

Permalink
Merge branch 'master' of github.com:acacha/adminlte-laravel
Browse files Browse the repository at this point in the history
  • Loading branch information
manelgavalda committed Jul 17, 2020
2 parents 056d6ff + 3332761 commit 0e16054
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"ionicons": "^3.0.0",
"jquery": "^3.5",
"laravel-mix": "^2.0",
"lodash": "^4.17.13",
"lodash": "^4.17.19",
"vue": "^2.5.7"
}
}

0 comments on commit 0e16054

Please sign in to comment.