Merge develop and fix conflict
This commit is contained in:
commit
0ab828bb30
25 changed files with 2489 additions and 312 deletions
|
@ -27,7 +27,7 @@
|
|||
:href="attachment.url" target="_blank"
|
||||
:title="attachment.description"
|
||||
>
|
||||
<StillImage referrerpolicy="referrerPolicy" :mimetype="attachment.mimetype" :src="attachment.large_thumb_url || attachment.url"/>
|
||||
<StillImage :referrerpolicy="referrerpolicy" :mimetype="attachment.mimetype" :src="attachment.large_thumb_url || attachment.url"/>
|
||||
</a>
|
||||
|
||||
<a class="video-container"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue