Browse Source

Merge remote-tracking branch 'origin/master' into merge.py3k

Conflicts:
	test_requirements.txt
Gavin Carothers 11 years ago
parent
commit
2f91cf7143
1 changed files with 0 additions and 3 deletions
  1. 0 3
      test_requirements.txt

+ 0 - 3
test_requirements.txt

@@ -1,3 +0,0 @@
-# Requirements used for testing
-mock >= 0.5.0
-meld3 >= 1.0.0