Fxing conflicts
This commit is contained in:
commit
92874b6902
24 changed files with 1103 additions and 14 deletions
|
@ -24,6 +24,7 @@ const defaultState = {
|
|||
disableChat: false,
|
||||
scopeCopy: true,
|
||||
subjectLineBehavior: 'email',
|
||||
postContentType: 'text/plain',
|
||||
loginMethod: 'password',
|
||||
nsfwCensorImage: undefined,
|
||||
vapidPublicKey: undefined,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue