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

@ -108,6 +108,7 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => {
copyInstanceOption('alwaysShowSubjectInput')
copyInstanceOption('noAttachmentLinks')
copyInstanceOption('showFeaturesPanel')
copyInstanceOption('hideSitename')
return store.dispatch('setTheme', config['theme'])
}