summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2013-09-05 18:19:01 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2013-09-05 18:19:01 -0300
commit9c13850bbf871808d265380d9e549c4ed8278c7b (patch)
treef3a2e23ecb9b7bd01fa2b73efaf32ae92f5c2f51
parent9a82c662bbc334a66f3aa021f1bbbc1f32cddcc8 (diff)
parent0292e05ea741bea0fd4fe22b799fd2eead0bd67e (diff)
Merge remote-tracking branch 'kali/bug/workaround-keyring-version-problem' into develop
-rw-r--r--pkg/requirements.pip2
1 files changed, 2 insertions, 0 deletions
diff --git a/pkg/requirements.pip b/pkg/requirements.pip
index 7d0f79af..b39960b7 100644
--- a/pkg/requirements.pip
+++ b/pkg/requirements.pip
@@ -18,6 +18,8 @@ qt4reactor
python-gnupg
python-daemon # this should not be needed for Windows.
+keyring<3.0.0 # See #3759
+
leap.common>=0.3.0
leap.soledad.client>=0.3.0
leap.keymanager>=0.2.0