merge develop
This commit is contained in:
parent
2ee8d21366
commit
79efe0646c
51 changed files with 835 additions and 157 deletions
|
@ -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,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue