diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-08-01 18:10:46 +0200 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2016-08-01 18:10:46 +0200 |
| commit | c6fd65ef7639cd67487c831db10dd79e4510efa6 (patch) | |
| tree | 2c825413c26df7d0c5394d01c2599003cab87c0b /data/config.default.php | |
| parent | 93f7f849874dcdf1263370ff08c72a962f8de56f (diff) | |
| parent | 17c3e616e8c3b927ee46258a8b8b20371bf59592 (diff) | |
Resolve git conflict
Diffstat (limited to 'data/config.default.php')
| -rw-r--r-- | data/config.default.php | 1 |
1 files changed, 0 insertions, 1 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). |