Ivan Tashkinov 835ac2157c Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes ... # Conflicts: # CHANGELOG.md		2019-12-10 08:55:14 +03: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	Document with_move parameter of the notification API	2019-12-09 14:46:06 +07: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