diff options
| author | eris <femmediscord@gmail.com> | 2021-06-17 19:35:09 +0000 |
|---|---|---|
| committer | eris <femmediscord@gmail.com> | 2021-06-17 19:35:09 +0000 |
| commit | b2ebfc1fd61cd4c3e92f6a0fde1f44ec26c37962 (patch) | |
| tree | 77994fec5c2b18c8c60a7287b36cab75f723f40b /src/App.vue | |
| parent | e1361a1caef3aa9d1faaeb420b03c5400a44c943 (diff) | |
| parent | 338134acfb5dc70210b55e5e1736b6f90f9d250c (diff) | |
Merge branch 'develop' into 'editProfile'
# 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" /> |