Merge branch 'develop' into 'showMobileNewPost'

# Conflicts:
#   CHANGELOG.md
#   src/App.js
This commit is contained in:
eris 2021-06-15 21:49:33 +00:00
commit cab0095989
7 changed files with 13 additions and 1 deletions

View file

@ -348,6 +348,7 @@
"hide_all_muted_posts": "Hide muted posts",
"max_thumbnails": "Maximum amount of thumbnails per post",
"hide_isp": "Hide instance-specific panel",
"hide_shoutbox": "Hide instance shoutbox",
"right_sidebar": "Show sidebar on the right side",
"always_show_post_button": "Always show floating New Post button",
"hide_wallpaper": "Hide instance wallpaper",