projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5c5c850
8df348a
)
Merge branch 'scarlett/pleroma-summary-html-api' into 'develop'
author
lambda
<pleromagit@rogerbraun.net>
Wed, 9 Jan 2019 16:26:38 +0000
(16:26 +0000)
committer
lambda
<pleromagit@rogerbraun.net>
Wed, 9 Jan 2019 16:26:38 +0000
(16:26 +0000)
Scarlett/pleroma summary html api
See merge request pleroma/pleroma!647
1
2
lib/pleroma/web/twitter_api/views/activity_view.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/web/twitter_api/views/activity_view_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/twitter_api/views/activity_view.ex
Simple merge
diff --cc
test/web/twitter_api/views/activity_view_test.exs
Simple merge
projects / akkoma / commitdiff