summaryrefslogtreecommitdiff
path: root/common/pkg
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2015-02-11 14:03:29 -0400
committerKali Kaneko <kali@leap.se>2015-02-11 14:03:29 -0400
commit58256957af8329f49d983852063eeaec74179c4d (patch)
tree4d95bf772a8845669bf9b5c7b6dc26f58bfdaa59 /common/pkg
parentfa8dacef003d30cd9b56f7e2b07baa3b387c1e20 (diff)
parent14f34b1f64a667bf4a146e8579f95c5d308a1f77 (diff)
Merge branch 'feature/async-api' into develop
Diffstat (limited to 'common/pkg')
-rw-r--r--common/pkg/requirements-testing.pip1
1 files changed, 1 insertions, 0 deletions
diff --git a/common/pkg/requirements-testing.pip b/common/pkg/requirements-testing.pip
index 9302450c..c72c9fc4 100644
--- a/common/pkg/requirements-testing.pip
+++ b/common/pkg/requirements-testing.pip
@@ -3,3 +3,4 @@ testscenarios
leap.common
leap.soledad.server
leap.soledad.client
+setuptools-trial