projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
455e072
d23a80e
)
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and...
author
Ivan Tashkinov
<ivantashkinov@gmail.com>
Thu, 19 Dec 2019 14:24:08 +0000
(17:24 +0300)
committer
Ivan Tashkinov
<ivantashkinov@gmail.com>
Thu, 19 Dec 2019 14:24:08 +0000
(17:24 +0300)
1
2
lib/pleroma/web/twitter_api/controllers/util_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/twitter_api/controllers/util_controller.ex
Simple merge