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
..
credo/check/consistency	Move Consistency.FileLocation to ./test	2020-10-13 19:57:45 +02:00
fixtures	tests consistency	2020-10-13 16:35:09 +03:00
instance_static	support for special chars in pack name	2020-09-24 09:12:37 +03:00
mix	fix test	2020-10-15 22:31:52 +03:00
pleroma	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
support	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
test_helper.exs	removing GunMock to use Mox	2020-03-06 20:23:58 +03:00