diff options
| author | eris <femmediscord@gmail.com> | 2021-06-15 21:49:33 +0000 |
|---|---|---|
| committer | eris <femmediscord@gmail.com> | 2021-06-15 21:49:33 +0000 |
| commit | cab00959892ab92a1dcad3a386cae9e0cf5c2cb5 (patch) | |
| tree | 151c7633283c6291ff54881d0c67bb6ad7d4b3a2 /src/App.vue | |
| parent | 4639e30cb8e6086a57acbe35d864e8b453e197ba (diff) | |
| parent | 338134acfb5dc70210b55e5e1736b6f90f9d250c (diff) | |
Merge branch 'develop' into 'showMobileNewPost'
# Conflicts:
# CHANGELOG.md
# src/App.js
Diffstat (limited to 'src/App.vue')
| -rw-r--r-- | src/App.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/App.vue b/src/App.vue index 6b867498..eb65b548 100644 --- a/src/App.vue +++ b/src/App.vue @@ -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 }" |