summaryrefslogtreecommitdiffstats
path: root/COPYING
diff options
context:
space:
mode:
authorPaul Boddie <paul@boddie.org.uk>2014-08-06 17:48:26 +0200
committerPaul Boddie <paul@boddie.org.uk>2014-08-06 17:48:26 +0200
commitfee17e6f7a5fa995f7d77c7822e3ed1f2f8bffb5 (patch)
treeb401d3b6c748c09895ec4f0a887f3f2f0cdb6e0d /COPYING
parente0e89b980b8671eabf682cd83efc603775048228 (diff)
parenta8555e3e8789fd02b7d5749ea4fc51b84e57285f (diff)
downloadpykolab-dev/boddie.tar.gz
Merge branch 'master' of git://git.kolab.org/git/pykolab into dev/boddiedev/boddie
Conflicts: conf/kolab.conf po/POTFILES.in pykolab/auth/ldap/__init__.py pykolab/auth/ldap/cache.py pykolab/cli/cmd_rename_mailbox.py pykolab/imap/__init__.py pykolab/imap/cyrus.py pykolab/wap_client/__init__.py pykolab/xml/event.py
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions