Fxing conflicts

This commit is contained in:
jasper 2019-02-08 13:13:11 -08:00
commit 92874b6902
24 changed files with 1103 additions and 14 deletions

View file

@ -24,6 +24,7 @@ const defaultState = {
disableChat: false,
scopeCopy: true,
subjectLineBehavior: 'email',
postContentType: 'text/plain',
loginMethod: 'password',
nsfwCensorImage: undefined,
vapidPublicKey: undefined,