Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes

.formatter.exs

CHANGELOG.md

config/config.exs

docs/API/differences_in_mastoapi_responses.md

docs/API/pleroma_api.md

docs/administration/CLI_tasks/config.md

docs/administration/CLI_tasks/database.md

docs/administration/CLI_tasks/digest.md

docs/administration/CLI_tasks/emoji.md

docs/administration/CLI_tasks/general_cli_task_info.include

docs/administration/CLI_tasks/instance.md

docs/administration/CLI_tasks/relay.md

docs/administration/CLI_tasks/uploads.md

docs/administration/CLI_tasks/user.md

docs/configuration/cheatsheet.md

lib/mix/tasks/pleroma/config.ex

lib/mix/tasks/pleroma/notification_settings.ex

lib/mix/tasks/pleroma/user.ex

lib/pleroma/activity.ex

lib/pleroma/activity/queries.ex