projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c16c7fd
377f84f
)
Merge remote-tracking branch 'upstream/develop' into simplepolicy-announce-leak
author
Alex Gleason
<alex@alexgleason.me>
Fri, 30 Apr 2021 19:21:17 +0000
(14:21 -0500)
committer
Alex Gleason
<alex@alexgleason.me>
Fri, 30 Apr 2021 19:21:17 +0000
(14:21 -0500)
1
2
lib/pleroma/web/activity_pub/mrf/simple_policy.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/pleroma/web/activity_pub/mrf/simple_policy_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/activity_pub/mrf/simple_policy.ex
Simple merge
diff --cc
test/pleroma/web/activity_pub/mrf/simple_policy_test.exs
Simple merge
projects / akkoma / commitdiff