Merge branch 'master' of git://github.com/thomasjsn/BookStack into thomasjsn-master

diff --cc resources/assets/js/components/markdown-editor.js
index 6eba242d0c71e979d55c1d5bcbd38315a69375a9,88b61f0beeac9c871910b87063fa22b708793661..dd58a0ece4c2daaac6304fea56b495dc47558192
--- 1/resources/assets/js/components/markdown-editor.js
--- 2/resources/assets/js/components/markdown-editor.js
+++ b/resources/assets/js/components/markdown-editor.js
@@@ -427,4 -427,4 +427,4 @@@ class MarkdownEditor 
  
  }
  
- export default MarkdownEditor ;
 -module.exports = MarkdownEditor ;
++export default MarkdownEditor ;