Merge remote-tracking branch 'upstream/develop' into by-approval

diff --cc CHANGELOG.md
Simple merge

diff --cc config/config.exs
Simple merge

diff --cc config/description.exs
Simple merge

diff --cc docs/configuration/cheatsheet.md
Simple merge

diff --cc lib/pleroma/user.ex
Simple merge

diff --cc lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
Simple merge

diff --cc lib/pleroma/web/admin_api/views/account_view.ex
Simple merge

diff --cc lib/pleroma/web/mastodon_api/views/instance_view.ex
Simple merge

diff --cc test/user_test.exs
Simple merge

diff --cc test/web/admin_api/controllers/admin_api_controller_test.exs
Simple merge

diff --cc test/web/mastodon_api/controllers/account_controller_test.exs
Simple merge

diff --cc test/web/twitter_api/twitter_api_test.exs
Simple merge