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
..
mrf	changes after rebase	2020-10-13 16:44:03 +03:00
object_validators	JPEG content_type must be image/jpeg	2020-10-13 10:37:24 -05:00
transmogrifier	Merge branch 'develop' into refactor/locked_user_field	2020-10-13 09:54:29 -05:00
views	tests consistency	2020-10-13 16:35:09 +03:00
activity_pub_controller_test.exs	Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances	2020-10-17 13:12:39 +03:00
activity_pub_test.exs	Merge branch 'feature/gen-magic' into 'develop'	2020-10-14 17:31:45 +00:00
mrf_test.exs	tests consistency	2020-10-13 16:35:09 +03:00
pipeline_test.exs	tests consistency	2020-10-13 16:35:09 +03:00
publisher_test.exs	tests consistency	2020-10-13 16:35:09 +03:00
relay_test.exs	tests consistency	2020-10-13 16:35:09 +03:00
side_effects_test.exs	tests consistency	2020-10-13 16:35:09 +03:00
transmogrifier_test.exs	tests consistency	2020-10-13 16:35:09 +03:00
utils_test.exs	Merge branch 'develop' into refactor/locked_user_field	2020-10-13 09:54:29 -05:00
visibility_test.exs	tests consistency	2020-10-13 16:35:09 +03:00