Merge branch 'develop' into 'showMobileNewPost'
# Conflicts: # CHANGELOG.md # src/App.js
This commit is contained in:
commit
cab0095989
7 changed files with 13 additions and 1 deletions
|
@ -21,6 +21,7 @@ export const defaultState = {
|
|||
customThemeSource: undefined,
|
||||
hideISP: false,
|
||||
hideInstanceWallpaper: false,
|
||||
hideShoutbox: false,
|
||||
// bad name: actually hides posts of muted USERS
|
||||
hideMutedPosts: undefined, // instance default
|
||||
collapseMessageWithSubject: undefined, // instance default
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue