Skip to content

Commit

Permalink
Merge branch '2.4' into dependabot/npm_and_yarn/highlight.js-11.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
boxshadow authored Sep 18, 2021
2 parents 50a5375 + 49ddefd commit bf3103c
Show file tree
Hide file tree
Showing 2 changed files with 128 additions and 28 deletions.
144 changes: 122 additions & 22 deletions package-lock.json

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

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
"laravel-mix": "^4.1.2",
"opencollective": "^1.0.3",
"resolve-url-loader": "^3.1.0",
"sass": "^1.22.9",
"sass": "^1.41.1",
"sass-loader": "7.*",
"vue-template-compiler": "^2.6.10"
"vue-template-compiler": "^2.6.14"
},
"dependencies": {
"@slimkit/plus-editor": "^0.0.3",
Expand All @@ -35,16 +35,16 @@
"chart.js": "^2.7.2",
"echarts": "^4.1.0",
"highlight.js": "^11.2.0",
"jquery": "^3.3.1",
"jquery": "^3.6.0",
"js-md5": "^0.7.3",
"lodash": "^4.17.15",
"lodash": "^4.17.21",
"markdown-it": "^8.4.1",
"plus-message-bundle": "^1.0.2",
"simkit-bootstrap-ui-kit": "^1.1.1",
"vue": "^2.6.10",
"vue": "^2.6.14",
"vue-echarts-v3": "^2.0.1",
"vue-router": "^3.0.1",
"vuex": "^3.1.1",
"vuex": "^3.6.2",
"vuex-router-sync": "^5.0.0"
},
"collective": {
Expand Down

0 comments on commit bf3103c

Please sign in to comment.