Merge branch 'master' into remove-i18n

2019-04-12 17:35:44 +08:00
parent 938d764e6d fdea6c684a
commit 0efdf47400
82 changed files with 510 additions and 287 deletions
--- a/src/components/Tinymce/components/EditorImage.vue
+++ b/src/components/Tinymce/components/EditorImage.vue
--- a/src/components/Tinymce/index.vue
+++ b/src/components/Tinymce/index.vue
@@ -8,7 +8,7 @@
 </template>

 <script>
-import editorImage from './components/editorImage'
+import editorImage from './components/EditorImage'
 import plugins from './plugins'
 import toolbar from './toolbar'