honkoma

Author	SHA1	Message	Date
lain	81293e5aad	ActivityPubController: Don't return local only objects	2020-11-17 13:11:39 +01:00
Ivan Tashkinov	049ece1ef3	Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances # Conflicts: # lib/pleroma/web/feed/user_controller.ex # lib/pleroma/web/o_status/o_status_controller.ex # lib/pleroma/web/router.ex # lib/pleroma/web/static_fe/static_fe_controller.ex	2020-10-17 13:12:39 +03:00
Mark Felder	b738f70953	Merge branch 'develop' into feature/gen-magic	2020-10-13 10:08:38 -05:00
Alexander Strizhakov	7dffaef479	tests consistency	2020-10-13 16:35:09 +03:00