Merge branch 'authentication' of github.com:cristen/Radicale into authentication

2013-09-13 17:41:21 +02:00
parent cb408e9475 e2512b12fb
commit 6c40f5e24a
8 changed files with 48 additions and 52 deletions
--- a/radicale/config.py
+++ b/radicale/config.py
@@ -53,8 +53,6 @@ INITIAL_CONFIG = {
        "stock": "utf-8"},
    "auth": {
        "type": "None",
-        "public_users": "public",
-        "private_users": "private",
        "htpasswd_filename": "/etc/radicale/users",
        "htpasswd_encryption": "crypt",
        "imap_hostname": "localhost",