Merge dev fix conflicts

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)
     },

src/components/attachment/attachment.vue

@@ -19,7 +19,7 @@
       :href="attachment.url" target="_blank"
       :title="attachment.description"
     >
-      <StillImage :class="{'small': isSmall}" referrerpolicy="no-referrer" :mimetype="attachment.mimetype" :src="attachment.large_thumb_url || attachment.url"/>
+      <StillImage :class="{'small': isSmall}" referrerpolicy="referrerPolicy" :mimetype="attachment.mimetype" :src="attachment.large_thumb_url || attachment.url"/>
     </a>
 
     <a class="video-container"