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
..
API	Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions	2020-03-14 15:37:02 +03:00
administration	CLI_tasks: Use manpage formatting conventions	2020-03-11 08:48:50 +01:00
configuration	fix for :fetch_initial_posts	2020-03-02 10:29:24 +01:00
installation	installation/otp_en.md: Fix pleroma.nginx target [deb]	2020-03-10 11:49:23 +01:00
clients.md	[#1560] Added tests for non-federating instance bahaviour to ActivityPubControllerTest.	2020-03-02 21:43:18 +03:00
introduction.md	[#1505] Restricted max thread distance for fetching replies on incoming federation (in addition to reply-to depth restriction).	2020-02-15 20:41:38 +03:00