projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
933dc12
ecb8fe1
)
Merge branch 'develop' into issue/1354
author
Mark Felder
<feld@FreeBSD.org>
Sun, 12 Jan 2020 18:12:15 +0000
(12:12 -0600)
committer
Mark Felder
<feld@FreeBSD.org>
Sun, 12 Jan 2020 18:12:15 +0000
(12:12 -0600)
1
2
lib/pleroma/web/activity_pub/publisher.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/twitter_api/controllers/util_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/web/twitter_api/util_controller_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/activity_pub/publisher.ex
Simple merge
diff --cc
lib/pleroma/web/twitter_api/controllers/util_controller.ex
Simple merge
diff --cc
test/web/twitter_api/util_controller_test.exs
Simple merge
projects / akkoma / commitdiff