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
..
2020-05-12 17:14:59 -05:00
2020-10-13 16:35:09 +03:00
2020-08-05 17:46:14 +03:00
2020-03-03 16:44:49 -06:00
2020-06-23 15:09:01 +03:00
2020-03-03 16:46:45 -06:00