From: Dan Brown <redacted>
Date: Sat, 10 Nov 2018 15:23:29 +0000 (+0000)
Subject: Merge branch 'master' of git://github.com/thomasjsn/BookStack into thomasjsn-master
X-Git-Tag: v0.24.2~3^2^2~1
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/321b53c827dd652549d92e9431c455b61e7faace

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

321b53c827dd652549d92e9431c455b61e7faace
diff --cc resources/assets/js/components/markdown-editor.js
index 6eba242d0,88b61f0be..dd58a0ece
--- a/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 ;