summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2016-07-31 14:58:19 +0200
committerGravatar Alexandre Alapetite <alexandre@alapetite.fr> 2016-07-31 14:58:19 +0200
commitc1548e732d7472c40473b3d99858059333a05eae (patch)
treef956b9f98527cd6acadd7dfefe7c0929e6edfe55 /data
parenta78b3f5e7f19a1f1320fcb12f7c8b450f9a9dba4 (diff)
Remove Mozilla Persona login
https://github.com/FreshRSS/FreshRSS/issues/1052
Diffstat (limited to 'data')
-rw-r--r--data/config.default.php1
-rw-r--r--data/users/_/config.default.php1
2 files changed, 0 insertions, 2 deletions
diff --git a/data/config.default.php b/data/config.default.php
index cae15330f..be3fa8ae2 100644
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -40,7 +40,6 @@ return array(
# Login method:
# `none` is without password and shows only the default user;
# `form` is a conventional Web login form;
- # `persona` is the email-based login by Mozilla;
# `http_auth` is an access controled by the HTTP Web server (e.g. `/FreshRSS/p/i/.htaccess` for Apache)
# if you use `http_auth`, remember to protect only `/FreshRSS/p/i/`,
# and in particular not protect `/FreshRSS/p/api/` if you would like to use the API (different login system).
diff --git a/data/users/_/config.default.php b/data/users/_/config.default.php
index 8f8ff528c..4a3403453 100644
--- a/data/users/_/config.default.php
+++ b/data/users/_/config.default.php
@@ -5,7 +5,6 @@ return array (
'old_entries' => 3,
'keep_history_default' => 0,
'ttl_default' => 3600,
- 'mail_login' => '',
'token' => '',
'passwordHash' => '',
'apiPasswordHash' => '',