merge develop

This commit is contained in:
jared 2019-04-02 10:53:33 -04:00
parent 2ee8d21366
commit 79efe0646c
51 changed files with 835 additions and 157 deletions

View file

@ -15,7 +15,6 @@ const defaultState = {
redirectRootNoLogin: '/main/all',
redirectRootLogin: '/main/friends',
showInstanceSpecificPanel: false,
scopeOptionsEnabled: true,
formattingOptionsEnabled: false,
alwaysShowSubjectInput: true,
hideMutedPosts: false,
@ -32,6 +31,7 @@ const defaultState = {
vapidPublicKey: undefined,
noAttachmentLinks: false,
showFeaturesPanel: true,
minimalScopesMode: false,
// Nasty stuff
pleromaBackend: true,