merge pr

originjs · Apr 30, 2019 · 7ef3db4 · 7ef3db4
1 parent 547789d
commit 7ef3db4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/LOG.md b/LOG.md
@@ -1,4 +1,7 @@
 # 更新日志
+- **2.7.4** (19.4.30)
+    - [pr #415](https://github.com/hinesboy/mavonEditor/pull/415)
+    - [pr #417](https://github.com/hinesboy/mavonEditor/pull/417)
 - **2.7.3** (19.3.28)
     - 添加shortCut控制快捷键的开关
     - 修复自定义图片上传bug

diff --git a/dist/mavon-editor.js b/dist/mavon-editor.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "mavon-editor",
-  "version": "2.7.3",
+  "version": "2.7.4",
   "description": "Vue markdown editor",
   "main": "dist/mavon-editor.js",
   "scripts": {