Merge branch 'release_16.10' into release_17.01

Conflicts:
	lib/galaxy/dependencies/pinned-requirements.txt
This commit is contained in:
Nicola Soranzo
2017-10-30 18:49:17 +00:00
2 changed files with 1 additions and 1 deletions
@@ -1,5 +1,6 @@
nose
NoseHTML
twill==0.9.1
testfixtures
mock
selenium
@@ -29,7 +29,6 @@ nose==1.3.7
Parsley==1.3
six==1.10.0
Whoosh==2.7.4
testfixtures==4.10.0
galaxy_sequence_utils==1.0.2
# Cheetah and dependencies