diff options
| author | jasper <jasper92341@hotmail.com> | 2019-02-08 13:13:11 -0800 |
|---|---|---|
| committer | jasper <jasper92341@hotmail.com> | 2019-02-08 13:13:11 -0800 |
| commit | 92874b6902ee0d06ac4603c0b6351ccab92c60a5 (patch) | |
| tree | f9319add6c0f22fdca341f87d97b04401a822880 /src/modules | |
| parent | 70c05a0c085adb95ef9946ac58a461f56252c2c2 (diff) | |
| parent | da0a5535eb09f6637df921a8a5f951c295bedeac (diff) | |
Fxing conflicts
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/config.js | 6 | ||||
| -rw-r--r-- | src/modules/instance.js | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/modules/config.js b/src/modules/config.js index c9528f6f..eb2df541 100644 --- a/src/modules/config.js +++ b/src/modules/config.js @@ -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 = { diff --git a/src/modules/instance.js b/src/modules/instance.js index 1bb5eb1b..46ca04d8 100644 --- a/src/modules/instance.js +++ b/src/modules/instance.js @@ -24,6 +24,7 @@ const defaultState = { disableChat: false, scopeCopy: true, subjectLineBehavior: 'email', + postContentType: 'text/plain', loginMethod: 'password', nsfwCensorImage: undefined, vapidPublicKey: undefined, |