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	Move Consistency.FileLocation to ./test	2020-10-13 19:57:45 +02:00
fixtures	Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 2236-no-name	2020-10-26 16:30:48 +01: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-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	removing GunMock to use Mox	2020-03-06 20:23:58 +03:00