projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1eb7a86
163c658
)
Merge branch 'twitterapi-bitlbee' into 'develop'
author
lambda
<pleromagit@rogerbraun.net>
Tue, 14 Nov 2017 16:47:54 +0000
(16:47 +0000)
committer
lambda
<pleromagit@rogerbraun.net>
Tue, 14 Nov 2017 16:47:54 +0000
(16:47 +0000)
TwitterAPI: Add missing endpoints for bitlbee.
Closes #67
See merge request pleroma/pleroma!18
1
2
lib/pleroma/web/router.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/twitter_api/twitter_api_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
test/web/twitter_api/twitter_api_controller_test.exs
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/router.ex
Simple merge
diff --cc
lib/pleroma/web/twitter_api/twitter_api_controller.ex
Simple merge
diff --cc
test/web/twitter_api/twitter_api_controller_test.exs
Simple merge