Merge branch 'develop' into activation-meta

CHANGELOG.md

config/description.exs

lib/pleroma/user.ex

lib/pleroma/web/activity_pub/activity_pub.ex

lib/pleroma/web/activity_pub/side_effects.ex

lib/pleroma/web/activity_pub/transmogrifier.ex

lib/pleroma/web/streamer/streamer.ex

lib/pleroma/web/views/masto_fe_view.ex

...po/migrations/20200630162024_rename_user_settings_col.exs

test/fixtures/fetch_mocks/104410921027210069.json

test/fixtures/fetch_mocks/9wTkLEnuq47B25EehM.json

test/fixtures/fetch_mocks/eal.json

test/fixtures/fetch_mocks/tuxcrafting.json

test/fixtures/tesla_mock/baptiste.gelex.xyz-article.json

test/fixtures/tesla_mock/peertube.moe-vid.json

test/object/fetcher_test.exs

test/user_test.exs

test/web/activity_pub/side_effects_test.exs

test/web/masto_fe_controller_test.exs

...ontrollers/account_controller/update_credentials_test.exs