Merge branch 'master' into 580

Axelrod-Python · May 11, 2016 · cde6840 · cde6840
2 parents 4b5feac + 3239411
commit cde6840
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,4 @@
+pyparsing==2.1.1 # Due to https://github.com/Axelrod-Python/Axelrod/issues/584
 numpy>=1.9.2
 matplotlib>=1.4.2
 hypothesis>=3.0