3 Commits (25832534cd57f8b114e7834bb19acec68faf2ce0)

Author	SHA1	Message	Date
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	4 years ago
Alexander Strizhakov	0374df1d12	other files consistency	4 years ago
Alexander Strizhakov	7dffaef479	tests consistency	4 years ago