Commit 0d227e41 authored by feld's avatar feld

Sync back up with develop

parent d82c0245
......@@ -17,10 +17,11 @@ const defaultState = {
alwaysShowSubjectInput: true,
defaultAvatar: '/images/avi.png',
defaultBanner: '/images/banner.png',
background: '/static/aurora_borealis.jpg',
// collapseMessageWithSubject: false, // MFC disabled
hideFilteredStatuses: false,
disableChat: false,
greentext: false,
hideFilteredStatuses: false,
hideMutedPosts: false,
hidePostStats: false,
hideSitename: false,
......@@ -36,7 +37,6 @@ const defaultState = {
redirectRootNoLogin: '/main/all',
scopeCopy: true,
showFeaturesPanel: true,
enableEmojiPicker: false,
showInstanceSpecificPanel: false,
sidebarRight: false,
subjectLineBehavior: 'email',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment