lain 1ae976ac51 Merge branch 'develop' into '1427-oauth-admin-scopes' ... # Conflicts: # CHANGELOG.md		2019-12-10 13:34:54 +00:00
..
admin_api.md	[#1427] Bugfix for `enforce_oauth_admin_scope_usage`. Admin API documentation entry.	2019-12-06 16:56:23 +03:00
differences_in_mastoapi_responses.md	[ActivityPub] Configurable ActivityPub actor type	2019-12-10 13:19:26 +00:00
pleroma_api.md	Update pleroma_api.md	2019-12-09 14:15:59 +00:00
prometheus.md	Rename some directories because MkDocs uses them for categories	2019-10-02 23:28:45 +03:00