Nicola Soranzo 14844e48eb Merge branch 'release_16.01' into release_16.04 ...

Conflicts:
	lib/galaxy/jobs/runners/drmaa.py

2016-06-10 17:31:10 +01:00

..

galaxy

Merge branch 'release_16.01' into release_16.04

2016-06-10 17:31:10 +01:00

galaxy_ext

Merge remote-tracking branch 'upstream/dev' into smash_eggs

2015-09-21 15:02:47 -04:00

galaxy_utils

For python2/3 compatibility, replace basestring with six's string_types, unicode with six's text_type.

2016-02-20 13:01:05 +01:00

tool_shed

wrap bare str raises with generic Exception()

2016-05-26 16:45:31 -04:00

log_tempfile.py

…

mimeparse.py

…

psyco_full.py

…