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 /pkg | |
| 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 'pkg')
| -rw-r--r-- | pkg/requirements.pip | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/pkg/requirements.pip b/pkg/requirements.pip index 7ec489d..ea59aaa 100644 --- a/pkg/requirements.pip +++ b/pkg/requirements.pip @@ -2,13 +2,5 @@ Twisted>=12.0.2 paisley>=0.3.1 ## XXX change me to whatever you name the package in pypi python-gnupg>=0.3.0 -leap.soledad -leap.soledad_server +leap.soledad.common>=0.3.0 leap.keymanager>=0.2.0 - -############### -# Development # -############### - -#leap.soledad # make this a dep as soon as it is installable from pypi !! --e git://github.com/andrejb/soledad.git@develop#egg=leap.soledad |