projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
26d509c
15ce710
)
Merge branch 'features/mastoapi/2.6.0-force-login-option' into 'develop'
author
lambda
<lain@soykaf.club>
Tue, 2 Apr 2019 10:57:38 +0000
(10:57 +0000)
committer
lambda
<lain@soykaf.club>
Tue, 2 Apr 2019 10:57:38 +0000
(10:57 +0000)
MastoAPI 2.6.0 `force_login` option
Closes #734
See merge request pleroma/pleroma!999
1
2
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/oauth/oauth_controller.ex
patch
|
diff1
|
diff2
|
blob
|
history
lib/pleroma/web/router.ex
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
Simple merge
diff --cc
lib/pleroma/web/oauth/oauth_controller.ex
Simple merge
diff --cc
lib/pleroma/web/router.ex
Simple merge
projects / akkoma / commitdiff