Merge branch 'master' of github.com:okfn/ckan

ckan · Nov 28, 2012 · 81a471c · 81a471c
2 parents aeddf42 + afcce35
commit 81a471c
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/pip-requirements-test.txt b/pip-requirements-test.txt
@@ -1,6 +1,5 @@
 # These are packages that required when running ckan tests
 
 nose
-requests==0.6.4
 -e git+https://github.com/okfn/ckanclient#egg=ckanclient
 
diff --git a/pip-requirements.txt b/pip-requirements.txt
@@ -27,3 +27,4 @@ routes==1.13
 paste==1.7.5.1
 Jinja2==2.6
 fanstatic==0.12
+requests==0.14