diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-08-21 15:34:16 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-08-21 15:34:16 -0300 |
| commit | 1693ace3c984d23c70374bd461660a2bd2ae1a66 (patch) | |
| tree | 54ae0e3dc45ec380c42f7c1278b78ef40155bfd5 /setup.py | |
| parent | 42741614d8a68033c0cc28273a3279fc09e22f85 (diff) | |
| parent | 8eb31d7a05fcdabf0d57ce0183a72818b157e6f4 (diff) | |
Merge remote-tracking branch 'drebs/feature/3487-split-soledad-into-common-client-and-server' into develop
Conflicts:
src/leap/mx/mail_receiver.py
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions