mirror of
https://github.com/Kozea/Radicale.git
synced 2025-08-28 19:40:54 +00:00
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:
commit
284063a270
4 changed files with 23 additions and 4 deletions
|
@ -19,4 +19,5 @@ class log:
|
|||
|
||||
_LOGGING = log()
|
||||
|
||||
sys.modules[__name__] = _LOGGING
|
||||
sys.modules[__name__] = _LOGGING
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue