diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-08-21 14:55:24 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-08-21 14:55:24 -0300 |
| commit | 8774968f20ff8d6edff5aabf71cf9a08d8566a05 (patch) | |
| tree | e7e4a1c8ced106342804f468d0e9751b825a2de6 /mail/src/leap/__init__.py | |
| parent | 62b298065e51e85a06908e98870c361821c51e88 (diff) | |
| parent | 6c006183ba2021bf5bedf98e86fd5a7c1a4506ba (diff) | |
Merge remote-tracking branch 'drebs/feature/3487-split-soledad-into-common-client-and-server' into develop
Conflicts:
src/leap/mail/imap/fetch.py
src/leap/mail/imap/server.py
Diffstat (limited to 'mail/src/leap/__init__.py')
0 files changed, 0 insertions, 0 deletions