Ivan Tashkinov ba50dc05a8 Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances ... # Conflicts: # CHANGELOG.md		2020-10-28 19:03:40 +03:00
..
credo/check/consistency
fixtures
instance_static
mix
pleroma	Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances	2020-10-28 19:03:40 +03:00
support	Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances	2020-10-28 19:03:40 +03:00
test_helper.exs