Merge branch 'master' of https://github.com/BookStackApp/BookStack

Conflicts:
	resources/assets/js/vues/vues.js

diff --cc resources/assets/js/vues/vues.js
index e5ab50c4da9b371f267c95b3ed95d578b9293f4d,a70d32009a04a6747f68a4f4daf06d67b8ed31c2..d4c4c4574645b8136900fbd95a5691692acf536a
--- 1/resources/assets/js/vues/vues.js
--- 2/resources/assets/js/vues/vues.js
+++ b/resources/assets/js/vues/vues.js
@@@ -10,7 -10,7 +10,8 @@@ let vueMapping = 
      'code-editor': require('./code-editor'),
      'image-manager': require('./image-manager'),
      'tag-manager': require('./tag-manager'),
+     'attachment-manager': require('./attachment-manager'),
 +    'page-comments': require('./page-comments')
  };
  
  window.vues = {};