Merge branch 'develop' into 'showMobileNewPost'

# Conflicts:
#   CHANGELOG.md
#   src/App.js
This commit is contained in:
eris 2021-06-15 21:49:33 +00:00
commit cab0095989
7 changed files with 13 additions and 1 deletions

View file

@ -50,7 +50,7 @@
<media-modal />
</div>
<shout-panel
v-if="currentUser && shout"
v-if="currentUser && shout && !hideShoutbox"
:floating="true"
class="floating-shout mobile-hidden"
:class="{ 'left': shoutboxPosition }"