Ivan Tashkinov ecb7809e92 Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions ... # Conflicts: # lib/pleroma/plugs/static_fe_plug.ex		2020-03-14 15:37:02 +03:00
..
admin_api.md	Exclude reblogs from `GET /api/pleroma/admin/statuses` by default	2020-03-02 16:47:31 +03:00
differences_in_mastoapi_responses.md	[#1560] Added tests for non-federating instance bahaviour to ActivityPubControllerTest.	2020-03-02 21:43:18 +03:00
pleroma_api.md	pleroma_api.md: direct_conversation_id vs. conversation_id	2020-03-02 04:01:37 +01:00
prometheus.md	Rename some directories because MkDocs uses them for categories	2019-10-02 23:28:45 +03:00