Ilja 487b516f8f Changes after pull ... * description is in mrf_simple now * a fix in the quarantine test because 'Pleroma.User.follow' returns two users now instead of only one		2020-12-14 11:40:29 +01:00
..
credo/check/consistency	Move Consistency.FileLocation to ./test	2020-10-13 19:57:45 +02:00
fixtures	Fix badly formatted JSON fixtures which causes Jason to erroneously detect control characters	2020-11-23 14:48:14 -06:00
instance_static
mix	Merge branch 'stream-follow-updates' into 'develop'	2020-12-09 15:52:31 +00:00
pleroma	Changes after pull	2020-12-14 11:40:29 +01:00
support	Merge branch 'simplePolicy_reasons_for_instance_specific_policies' of https://git.pleroma.social/ilja/pleroma into simplePolicy_reasons_for_instance_specific_policies	2020-12-13 22:34:44 +01:00
test_helper.exs