Merge branch 'develop' into feature/mobile-improvements-3
This commit is contained in:
commit
46de457f50
28 changed files with 457 additions and 116 deletions
|
@ -8,7 +8,6 @@
|
|||
"redirectRootLogin": "/main/friends",
|
||||
"chatDisabled": false,
|
||||
"showInstanceSpecificPanel": false,
|
||||
"scopeOptionsEnabled": false,
|
||||
"formattingOptionsEnabled": false,
|
||||
"collapseMessageWithSubject": false,
|
||||
"scopeCopy": true,
|
||||
|
@ -21,5 +20,6 @@
|
|||
"webPushNotifications": false,
|
||||
"noAttachmentLinks": false,
|
||||
"nsfwCensorImage": "",
|
||||
"showFeaturesPanel": true
|
||||
"showFeaturesPanel": true,
|
||||
"minimalScopesMode": false
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue