Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak
authorAlex Gleason <alex@alexgleason.me>
Fri, 30 Apr 2021 19:21:17 +0000 (14:21 -0500)
committerAlex Gleason <alex@alexgleason.me>
Fri, 30 Apr 2021 19:21:17 +0000 (14:21 -0500)
commit926a233cc4683b5c2511690166bca0bf09338361
tree175df0ef9a43fe5bb468329bfaaeab39fa830139
parentc16c7fdb8794df8558cf8fbe4231d8f9ec01bb6d
parent377f84f3678f9c2541fbd4a200cd93c5ab0dea24
Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak
lib/pleroma/web/activity_pub/mrf/simple_policy.ex
test/pleroma/web/activity_pub/mrf/simple_policy_test.exs