lain 1ae976ac51 Merge branch 'develop' into '1427-oauth-admin-scopes' ... # Conflicts: # CHANGELOG.md		2019-12-10 13:34:54 +00:00
..
admin_api.md
differences_in_mastoapi_responses.md	[ActivityPub] Configurable ActivityPub actor type	2019-12-10 13:19:26 +00:00
pleroma_api.md
prometheus.md