summaryrefslogtreecommitdiffstats
path: root/tests/__init__.py
diff options
context:
space:
mode:
authorPaul Boddie <paul@boddie.org.uk>2014-06-29 17:14:15 +0200
committerPaul Boddie <paul@boddie.org.uk>2014-06-29 17:14:15 +0200
commite0e89b980b8671eabf682cd83efc603775048228 (patch)
treeee4735da9d6a79742dc734316cc0401a8c168ff0 /tests/__init__.py
parentf337f57fe6b0afe718efa426f89945720d456d94 (diff)
parent50b0c2a384bd2da1b210c156c8e6e138d8948b9c (diff)
downloadpykolab-e0e89b980b8671eabf682cd83efc603775048228.tar.gz
Merge branch 'master' of git://git.kolab.org/git/pykolab into dev/boddie
Conflicts: pykolab/auth/__init__.py pykolab/auth/ldap/__init__.py pykolab/setup/setup_freebusy.py pykolab/setup/setup_roundcube.py
Diffstat (limited to 'tests/__init__.py')
0 files changed, 0 insertions, 0 deletions