summaryrefslogtreecommitdiffhomepage
path: root/dev-requirements.txt
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-04-14 10:58:43 -0400
committerAlex Gaynor <alex.gaynor@gmail.com>2014-04-14 10:58:43 -0400
commitb0876fa01394186d08938430f9459012fdde3bf1 (patch)
tree2eb38cbd35029e18051e8853a73ff5c1b2deacae /dev-requirements.txt
parentfded67e7120d79c619e541ccd3ba19898c194b5b (diff)
parentfa86d655dc8f08eb9171930c41b508e2bee08b08 (diff)
Merge branch 'master' into ecdsa-deterministic
Conflicts: paramiko/ecdsakey.py
Diffstat (limited to 'dev-requirements.txt')
-rw-r--r--dev-requirements.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/dev-requirements.txt b/dev-requirements.txt
index 5744f331..91ae8549 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -5,5 +5,5 @@ tox>=1.4,<1.5
invoke>=0.7.0
invocations>=0.5.0
sphinx>=1.1.3
-alabaster>=0.3.1
+alabaster>=0.4.0
releases>=0.5.2