Merge dev fix conflicts

2019-01-20 15:52:35 +02:00 · 2019-01-20 15:52:35 +02:00 · 8761e039d0
commit 8761e039d0
parent 485a061287 7651290e2b
17 changed files with 1987 additions and 628 deletions
--- a/src/components/attachment/attachment.js
+++ b/src/components/attachment/attachment.js
@ -26,6 +26,9 @@ const Attachment = {
    usePlaceHolder () {
      return this.size === 'hide' || this.type === 'unknown'
    },
+    referrerpolicy () {
+      return this.$store.state.instance.mediaProxyAvailable ? '' : 'no-referrer'
+    },
    type () {
      return fileTypeService.fileType(this.attachment.mimetype)
    },