projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
440b459
0f5bff8
)
Merge branch 'feature/relay' into 'develop'
author
lambda
<pleromagit@rogerbraun.net>
Mon, 27 Aug 2018 08:29:25 +0000
(08:29 +0000)
committer
lambda
<pleromagit@rogerbraun.net>
Mon, 27 Aug 2018 08:29:25 +0000
(08:29 +0000)
message relay
Closes #144
See merge request pleroma/pleroma!264
1
2
lib/pleroma/user.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/activity_pub/activity_pub.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/activity_pub/views/user_view.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/router.ex
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/user.ex
Simple merge
diff --cc
lib/pleroma/web/activity_pub/activity_pub.ex
Simple merge
diff --cc
lib/pleroma/web/activity_pub/views/user_view.ex
Simple merge
diff --cc
lib/pleroma/web/router.ex
Simple merge
projects / akkoma / commitdiff