Merge branch 'features/mastoapi/2.6.0-force-login-option' into 'develop'
authorlambda <lain@soykaf.club>
Tue, 2 Apr 2019 10:57:38 +0000 (10:57 +0000)
committerlambda <lain@soykaf.club>
Tue, 2 Apr 2019 10:57:38 +0000 (10:57 +0000)
commit091baf93169895c62418ccee81b80d00416aaa56
tree4498be40963cab228027d38525b7a6f65d7f47a4
parent26d509cc861ad865b12d187fc163fa78c4c128a7
parent15ce7104608869cb62c72c5beef0b23b1150cda0
Merge branch 'features/mastoapi/2.6.0-force-login-option' into 'develop'

MastoAPI 2.6.0 `force_login` option

Closes #734

See merge request pleroma/pleroma!999
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
lib/pleroma/web/oauth/oauth_controller.ex
lib/pleroma/web/router.ex