Merge branch 'release_17.01' into release_17.05

Browse Source

Conflicts:
	lib/galaxy/datatypes/data.py

...

This commit is contained in:

Nicola Soranzo

2017-09-06 18:26:49 +01:00

parent 1d485390b0 759780b72c

commit 41fe55129a

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available