Merge branch 'develop' into 'showMobileNewPost'

# Conflicts: # CHANGELOG.md # src/App.js
2021-06-15 21:49:33 +00:00 · 2021-06-15 21:49:33 +00:00 · cab0095989
commit cab0095989
parent 4639e30cb8 338134acfb
7 changed files with 13 additions and 1 deletions
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@ -21,6 +21,11 @@
            {{ $t('settings.hide_wallpaper') }}
          </BooleanSetting>
        </li>
+        <li v-if="instanceShoutboxPresent">
+          <BooleanSetting path="hideShoutbox">
+            {{ $t('settings.hide_shoutbox') }}
+          </BooleanSetting>
+        </li>
      </ul>
    </div>
    <div class="setting-item">