diff options
| author | Henry Jameson <me@hjkos.com> | 2021-06-16 13:52:13 +0300 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2021-06-16 13:52:13 +0300 |
| commit | a96a62929d723c3676174dfd71c0db4462599a12 (patch) | |
| tree | e6fbd1c0e50fe77580e3b8afc17a217d6f7f5a2a /src/App.vue | |
| parent | b87a9d6675cf7cd8d37d45e62013fab27cbc46e6 (diff) | |
| parent | 338134acfb5dc70210b55e5e1736b6f90f9d250c (diff) | |
Merge remote-tracking branch 'origin/develop' into settings-and-filtering
* 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" /> |