Merge remote-tracking branch 'origin/1.9.1-dev' into 1.9.1-dev

# Conflicts: # pipe.json # theme/x/9IPHP/css/common.css # theme/x/9IPHP/js/common.min.js # theme/x/Fara/css/common.css # theme/x/Fara/js/common.min.js # theme/x/Gina/css/common.css # theme/x/Gina/js/common.min.js # theme/x/Koma/css/common.css # theme/x/Koma/js/common.min.js # theme/x/Littlewin/css/common.css # theme/x/Littlewin/js/common.min.js # theme/x/Medium/css/common.css # theme/x/Medium/js/common.min.js # theme/x/Next/css/common.css # theme/x/Next/js/common.min.js
88250 · Jan 16, 2020 · 43ac855 · 43ac855
2 parents fd07933 + ccc871c
commit 43ac855
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/console/package-lock.json b/console/package-lock.json
diff --git a/console/package.json b/console/package.json
@@ -22,7 +22,7 @@
     "babel-polyfill": "^6.26.0",
     "particles.js": "^2.0.0",
     "sha512crypt-node": "^0.1.0",
-    "vditor": "^2.0.15",
+    "vditor": "^2.1.1",
     "vue-axios": "^2.1.4",
     "vue-i18n": "^8.11.2",
     "vuetify": "git+https://github.com/Vanessa219/vuetify.git#v1.2.12"

diff --git a/theme/js/common.js b/theme/js/common.js
@@ -313,7 +313,7 @@ export const initPjax = (cb) => {
 (() => {
   $.ajax({
     method: 'GET',
-    url: 'https://cdn.jsdelivr.net/npm/vditor@2.0.15/dist/index.min.js',
+    url: 'https://cdn.jsdelivr.net/npm/vditor@2.1.1/dist/index.min.js',
     dataType: 'script',
     cache: true,
     success: () => {

diff --git a/theme/package-lock.json b/theme/package-lock.json