Merge branch 'develop' into 'scrobbles-age'
# Conflicts: # src/i18n/en.json
This commit is contained in:
commit
51709ad318
208 changed files with 5530 additions and 2338 deletions
|
|
@ -36,6 +36,7 @@ export const defaultState = {
|
|||
hideMutedThreads: undefined, // instance default
|
||||
hideWordFilteredPosts: undefined, // instance default
|
||||
muteBotStatuses: undefined, // instance default
|
||||
muteSensitiveStatuses: undefined, // instance default
|
||||
collapseMessageWithSubject: undefined, // instance default
|
||||
padEmoji: true,
|
||||
hideAttachments: false,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue