Merge branch 'develop' into feature/delivery-tracking

CHANGELOG.md

config/description.exs

docs/api/admin_api.md

docs/api/pleroma_api.md

docs/config.md

lib/mix/tasks/pleroma/docs.ex

lib/pleroma/activity.ex

lib/pleroma/activity/queries.ex

lib/pleroma/docs/generator.ex

lib/pleroma/docs/json.ex

lib/pleroma/docs/markdown.ex

lib/pleroma/user.ex

lib/pleroma/web/activity_pub/transmogrifier.ex

lib/pleroma/web/activity_pub/utils.ex

lib/pleroma/web/admin_api/config.ex

lib/pleroma/web/router.ex

lib/pleroma/web/twitter_api/controllers/util_controller.ex

mix.exs

mix.lock

test/activity_test.exs