projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ad9c925
7755f49
)
Merge remote-tracking branch 'upstream/develop' into restrict-domain
author
Alex Gleason
<alex@alexgleason.me>
Wed, 5 Aug 2020 18:08:31 +0000
(13:08 -0500)
committer
Alex Gleason
<alex@alexgleason.me>
Wed, 5 Aug 2020 18:08:31 +0000
(13:08 -0500)
1
2
lib/pleroma/web/activity_pub/activity_pub.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/web/admin_api/controllers/admin_api_controller_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge
diff --cc
test/web/admin_api/controllers/admin_api_controller_test.exs
Simple merge
projects / akkoma / commitdiff