feld d289ad8579 Merge branch 'develop' into 'fix/2411-mutes-api' ... # Conflicts: # CHANGELOG.md # docs/development/API/differences_in_mastoapi_responses.md		2021-02-02 17:57:58 +00:00
..
admin_api.md	Add development section	2021-01-10 08:25:36 +00:00
chats.md	Add development section	2021-01-10 08:25:36 +00:00
differences_in_mastoapi_responses.md	Merge branch 'develop' into 'fix/2411-mutes-api'	2021-02-02 17:57:58 +00:00
pleroma_api.md	Add development section	2021-01-10 08:25:36 +00:00
prometheus.md	Add development section	2021-01-10 08:25:36 +00:00