Alex Gleason 6931dbfa58 Merge remote-tracking branch 'upstream/develop' into by-approval		2020-07-26 15:46:14 -05:00
..
admin_api.md	AdminAPI: Add `PATCH /api/pleroma/admin/users/approve` endpoint	2020-07-14 18:02:44 -05:00
chats.md	ChatController: Remove nonsensical pagination.	2020-06-08 11:09:53 +02:00
differences_in_mastoapi_responses.md	Expose the post formats in /api/v1/instance	2020-07-17 10:45:41 -05:00
pleroma_api.md	Rename notification "privacy_option" setting	2020-06-26 12:45:46 -05:00
prometheus.md	Rename some directories because MkDocs uses them for categories	2019-10-02 23:28:45 +03:00