diff options
| author | eris <femmediscord@gmail.com> | 2021-06-15 21:50:39 +0000 |
|---|---|---|
| committer | eris <femmediscord@gmail.com> | 2021-06-15 21:50:39 +0000 |
| commit | 139a0d15620763329499265d505ae8f030e2ed69 (patch) | |
| tree | 6ee2f4fcff7d856a031de0eccd2db1d280eca502 /src/App.vue | |
| parent | e67f2954978b229fd703c0ce8fe8ca6a0947ad8e (diff) | |
| parent | 338134acfb5dc70210b55e5e1736b6f90f9d250c (diff) | |
Merge branch 'develop' into 'themeApply'
# Conflicts:
# CHANGELOG.md
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 6c582c03..c30f5e98 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" /> |