diff options
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/config.js | 4 | ||||
| -rw-r--r-- | src/modules/instance.js | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/modules/config.js b/src/modules/config.js index 2a70fbe2..eb2df541 100644 --- a/src/modules/config.js +++ b/src/modules/config.js @@ -30,9 +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 475da92e..46ca04d8 100644 --- a/src/modules/instance.js +++ b/src/modules/instance.js @@ -29,6 +29,7 @@ const defaultState = { nsfwCensorImage: undefined, vapidPublicKey: undefined, noAttachmentLinks: false, + showFeaturesPanel: false, // Nasty stuff pleromaBackend: true, |