diff options
| author | Tomás Touceda <chiiph@leap.se> | 2013-05-21 10:00:19 -0300 |
|---|---|---|
| committer | Tomás Touceda <chiiph@leap.se> | 2013-05-21 10:00:19 -0300 |
| commit | 598cdfdc1b691006ffea1849bfe105817c428589 (patch) | |
| tree | c36839bd65238d9bc6cdac2300d613657f4315d2 /mail/pkg | |
| parent | 13e87a826de68488c96960f611825a375bfe34b1 (diff) | |
| parent | 153ebc65ecce97aa58f0c8e5655c17be9e6efcd8 (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 'mail/pkg')
| -rw-r--r-- | mail/pkg/requirements.pip | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/mail/pkg/requirements.pip b/mail/pkg/requirements.pip index 5f4e7ef..d8888fd 100644 --- a/mail/pkg/requirements.pip +++ b/mail/pkg/requirements.pip @@ -1,3 +1,2 @@ -leap.common>=0.2.3-dev -leap.soledad +leap.soledad>=0.0.2-dev twisted |