projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
14d967f
c46490b
)
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
author
Egor Kislitsyn
<egor@kislitsyn.com>
Wed, 6 Feb 2019 04:33:00 +0000
(11:33 +0700)
committer
Egor Kislitsyn
<egor@kislitsyn.com>
Wed, 6 Feb 2019 04:33:00 +0000
(11:33 +0700)
1
2
lib/pleroma/web/activity_pub/activity_pub.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/activity_pub/activity_pub_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge
diff --cc
lib/pleroma/web/activity_pub/activity_pub_controller.ex
Simple merge
projects / akkoma / commitdiff