therwi/sunkkoma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fxing conflicts

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

6
src/modules/config.js
View file

@ -30,7 +30,13 @@ const defaultState = {
interfaceLanguage: browserLocale,
scopeCopy: undefined, // instance default
subjectLineBehavior: undefined, // instance default
<<<<<<< HEAD
alwaysShowSubjectInput: undefined // instance default
=======
alwaysShowSubjectInput: undefined, // instance default
showFeaturesPanel: true,
postContentType: undefined // instance default
>>>>>>> da0a5535eb09f6637df921a8a5f951c295bedeac
}
const config = {

1
src/modules/instance.js
View file

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