Merge branch 'oauth' into 'develop'

Move login to oauth.

See merge request pleroma/pleroma-fe!367

1 files changed, 6 insertions, 0 deletions

diff --git a/README.md b/README.md
index 5a3e2a4b..b6e5a586 100644
--- a/README.md
+++ b/README.md
@@ -32,3 +32,9 @@ npm run unit
 # Configuration
 
 Edit config.json for configuration. scopeOptionsEnabled gives you input fields for CWs and the scope settings.
+
+## Options
+
+### Login methods
+
+```loginMethod``` can be set to either ```password``` (the default) or ```token```, which will use the full oauth redirection flow, which is useful for SSO situations.