summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-03-05 09:55:19 -0800
committerJeff Forcier <jeff@bitprophet.org>2014-03-05 09:55:19 -0800
commitfeb78d8a3f4ec4866da940cac2c82505223727ab (patch)
tree2607b436eba84a0dcdf9d31a1271490481044d79
parent38785d9cd280244b77fc4aca96b61d693412f29c (diff)
parent48ab72508a7f8edc36e1f51ba05b89e8b7cd6bdf (diff)
downloadparamiko-feb78d8a3f4ec4866da940cac2c82505223727ab.tar.gz
Merge branch '1.11' into 1.12
-rw-r--r--dev-requirements.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/dev-requirements.txt b/dev-requirements.txt
index 88d94b72..e4dd942d 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -1,6 +1,5 @@
# Older junk
tox>=1.4,<1.5
-epydoc>=3.0,<3.1
# For newer tasks like building Sphinx docs.
# NOTE: Requires Python >=2.6
invoke>=0.7.0