diff options
| author | Henry Jameson <me@hjkos.com> | 2021-06-18 02:27:57 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2021-06-18 02:27:57 +0300 |
| commit | b68fb7738ba0721183d4910aecce1ac741692734 (patch) | |
| tree | 17ce3a83b8f107a6dafee90ba3c653e8baa3ca07 /src/App.vue | |
| parent | 1717a3aaf2fb104797669ecddbd4418dca10c0cd (diff) | |
| parent | 338134acfb5dc70210b55e5e1736b6f90f9d250c (diff) | |
Merge remote-tracking branch 'origin/develop' into better-still-emoji
* origin/develop:
Use proper setting name
Use cleaner instance config check for shoutbox setting
Make locale language cleaner
Don't shorten shoutbox to SB
Fix lint error
Update CHANGELOG.md
New option: Hide shoutbox
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" /> |