summaryrefslogtreecommitdiff
path: root/src/leap/mail/tests
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-05-21 10:00:19 -0300
committerTomás Touceda <chiiph@leap.se>2013-05-21 10:00:19 -0300
commite5fa0790f5231c333aba4bc5f6766556e062aa6c (patch)
tree6ffa31245438320da2934fda9aeb4f8248f0e3a7 /src/leap/mail/tests
parentd24b8590ff06708032c3a7a5856b728d3fc48c9a (diff)
parentffedb3b8e32c062604cc2f178213c82d90843788 (diff)
Merge remote-tracking branch 'kali/feature/imap-service2' into develop
Conflicts: pkg/requirements.pip src/leap/mail/imap/tests/test_imap.py
Diffstat (limited to 'src/leap/mail/tests')
0 files changed, 0 insertions, 0 deletions