[#1149] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job...

# Conflicts:
#	docs/config.md

diff --cc CHANGELOG.md
Simple merge

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

diff --cc mix.exs
Simple merge

diff --cc test/activity_test.exs
Simple merge

diff --cc test/user_test.exs
Simple merge

diff --cc test/web/mastodon_api/mastodon_api_controller_test.exs
Simple merge