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 | e5fa0790f5231c333aba4bc5f6766556e062aa6c (patch) | |
| tree | 6ffa31245438320da2934fda9aeb4f8248f0e3a7 /pkg | |
| parent | d24b8590ff06708032c3a7a5856b728d3fc48c9a (diff) | |
| parent | ffedb3b8e32c062604cc2f178213c82d90843788 (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 'pkg')
| -rw-r--r-- | pkg/requirements.pip | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkg/requirements.pip b/pkg/requirements.pip index 5f4e7ef..d8888fd 100644 --- a/pkg/requirements.pip +++ b/pkg/requirements.pip @@ -1,3 +1,2 @@ -leap.common>=0.2.3-dev -leap.soledad +leap.soledad>=0.0.2-dev twisted |