Merge dev fix conflicts

This commit is contained in:
shpuld 2019-01-20 15:52:35 +02:00
commit 8761e039d0
17 changed files with 1987 additions and 628 deletions

View file

@ -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"