projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d4ed3a3
fd48bd8
)
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
author
Maksim Pechnikov
<parallel588@gmail.com>
Mon, 23 Sep 2019 18:32:50 +0000
(21:32 +0300)
committer
Maksim Pechnikov
<parallel588@gmail.com>
Mon, 23 Sep 2019 18:32:50 +0000
(21:32 +0300)
1
2
lib/pleroma/web/activity_pub/views/user_view.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/web/activity_pub/views/user_view_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/activity_pub/views/user_view.ex
Simple merge
diff --cc
test/web/activity_pub/views/user_view_test.exs
Simple merge
projects / akkoma / commitdiff