Merge branch 'master' of git://gitorious.org/~clebail/radicale/ares-radicale
Conflicts: config radicale/acl/authLdap.py radicale/config.py radicale/log.py
This commit is contained in:
@@ -19,4 +19,5 @@ class log:
|
||||
|
||||
_LOGGING = log()
|
||||
|
||||
sys.modules[__name__] = _LOGGING
|
||||
sys.modules[__name__] = _LOGGING
|
||||
|
||||
|
||||
Reference in New Issue
Block a user