projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
108a39c
d9e2bd8
)
Merge branch 'develop' into issue/1280
author
Mark Felder
<feld@FreeBSD.org>
Sun, 26 Jan 2020 17:23:05 +0000
(11:23 -0600)
committer
Mark Felder
<feld@FreeBSD.org>
Sun, 26 Jan 2020 17:23:05 +0000
(11:23 -0600)
1
2
lib/pleroma/web/oauth/oauth_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/oauth/oauth_controller.ex
Simple merge