Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields...

# Conflicts:
#	lib/pleroma/user.ex

diff --cc CHANGELOG.md
Simple merge

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

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

diff --cc lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge

diff --cc lib/pleroma/web/common_api/utils.ex
Simple merge

diff --cc lib/pleroma/web/mastodon_api/controllers/account_controller.ex
Simple merge

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

diff --cc mix.lock
Simple merge

diff --cc test/notification_test.exs
Simple merge

diff --cc test/support/factory.ex
Simple merge

diff --cc test/user_test.exs
Simple merge

diff --cc test/web/activity_pub/activity_pub_test.exs
Simple merge

diff --cc test/web/mastodon_api/views/account_view_test.exs
Simple merge