Merge branch 'develop' into feature/lockdown-timelines-private-mode

This commit is contained in:
Mark Felder 2019-12-12 13:32:52 -06:00
commit 821a2bcc68
65 changed files with 659 additions and 1179 deletions

View file

@ -90,6 +90,7 @@ export default {
},
sitename () { return this.$store.state.instance.name },
chat () { return this.$store.state.chat.channel.state === 'joined' },
hideSitename () { return this.$store.state.instance.hideSitename },
suggestionsEnabled () { return this.$store.state.instance.suggestionsEnabled },
showInstanceSpecificPanel () {
return this.$store.state.instance.showInstanceSpecificPanel &&