Alex Gleason bedc558809 Merge remote-tracking branch 'upstream/develop' into accept-deletes		2020-04-20 10:15:40 -05:00
..
API	Merge branch 'feature/1584-client-captcha-options' into 'develop'	2020-04-17 09:19:35 +00:00
administration	Merge branch 'feature/1584-client-captcha-options' into 'develop'	2020-04-17 09:19:35 +00:00
configuration	Merge remote-tracking branch 'upstream/develop' into accept-deletes	2020-04-20 10:15:40 -05: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