minibikini 1cc8e94506 Merge branch 'develop' into 'feature/local-only-scope' ... # Conflicts: # CHANGELOG.md		2020-10-30 11:18:55 +00:00
..
admin_api.md	update docs	2020-10-22 11:53:28 +03:00
chats.md	ChatController: Remove nonsensical pagination.	2020-06-08 11:09:53 +02:00
differences_in_mastoapi_responses.md	Add local-only statuses	2020-10-15 18:37:44 +04:00
pleroma_api.md	docs update	2020-09-24 09:41:40 +03:00
prometheus.md	[#1668] Restricted access to app metrics endpoint by default. Added ability to configure IP whitelist for this endpoint.	2020-10-18 21:22:21 +03:00