diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-11-13 18:42:07 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-11-13 18:42:07 +0000 |
| commit | 11f8a4f312675a82d5fed9c5e75fed63a8456ffc (patch) | |
| tree | 18c0c0d6d966ca23f4644638974613d75ba1c8fe /static | |
| parent | e9b68b8c972e25df852543e9aa6670088bee06bb (diff) | |
| parent | 9f64c96721028b2749f17cbf7bd910382ce58154 (diff) | |
Merge branch 'oauth' into 'develop'
Move login to oauth.
See merge request pleroma/pleroma-fe!367
Diffstat (limited to 'static')
| -rw-r--r-- | static/config.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/static/config.json b/static/config.json index a6eace0f..69a70741 100644 --- a/static/config.json +++ b/static/config.json @@ -12,5 +12,6 @@ "formattingOptionsEnabled": false, "collapseMessageWithSubject": false, "hidePostStats": false, - "hideUserStats": false + "hideUserStats": false, + "loginMethod": "password" } |