Merge branch 'develop' into 'editProfile'

# Conflicts:
#   CHANGELOG.md
This commit is contained in:
eris 2021-06-17 19:35:09 +00:00
commit b2ebfc1fd6
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",
"hide_wallpaper": "Hide instance wallpaper",
"preload_images": "Preload images",