aboutsummaryrefslogtreecommitdiff
path: root/static
diff options
context:
space:
mode:
authorRoger Braun <roger@rogerbraun.net>2018-11-13 20:21:04 +0100
committerRoger Braun <roger@rogerbraun.net>2018-11-13 20:21:04 +0100
commit7f13cbc493862cfe3f93f7e33e14cf73de92de66 (patch)
tree8cceac003cb8ff5e6de43000e25dfb07debcf58a /static
parentffb9d4faf5c6cebb89947a0a9a085fa07e295d42 (diff)
parent11f8a4f312675a82d5fed9c5e75fed63a8456ffc (diff)
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma-fe into dm-tab
Diffstat (limited to 'static')
-rw-r--r--static/config.json3
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"
}