projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f8e56d4
12bb7fc
)
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
author
lain
<lain@soykaf.club>
Tue, 28 Apr 2020 12:16:21 +0000
(14:16 +0200)
committer
lain
<lain@soykaf.club>
Tue, 28 Apr 2020 12:16:21 +0000
(14:16 +0200)
1
2
lib/pleroma/web/activity_pub/activity_pub.ex
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge
projects / akkoma / commitdiff