projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9cf4c4f
3bc1138
)
Merge branch 'develop' into 'remove-twitter-api'
author
lain
<lain@soykaf.club>
Sat, 16 May 2020 17:07:09 +0000
(17:07 +0000)
committer
lain
<lain@soykaf.club>
Sat, 16 May 2020 17:07:09 +0000
(17:07 +0000)
# Conflicts:
# lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
1
2
lib/pleroma/web/router.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/router.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