From: Abijeet <redacted>
Date: Sun, 20 Aug 2017 15:05:56 +0000 (+0530)
Subject: Merge branch 'master' of https://github.com/BookStackApp/BookStack
X-Git-Tag: v0.18.0~1^2~15^2^2~7
X-Git-Url: http://source.bookstackapp.com/bookstack/commitdiff_plain/47d82a1ac2ec323295eb57ffe3beaf513e841496

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

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

47d82a1ac2ec323295eb57ffe3beaf513e841496
diff --cc resources/assets/js/vues/vues.js
index e5ab50c4d,a70d32009..d4c4c4574
--- a/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 = {};