Nicola Soranzo 07a3049999 Merge branch 'release_17.05' into dev ...

Conflicts:
	lib/galaxy/model/tool_shed_install/__init__.py

2017-08-15 16:24:32 +01:00

..

galaxy

Merge branch 'release_17.05' into dev

2017-08-15 16:24:32 +01:00

galaxy_ext

…

tool_shed

Merge branch 'revise_page' into revise_grid_forms

2017-08-10 11:38:32 -04:00

log_tempfile.py

Fix import order and Python3 compatibility for 51 files

2017-06-27 16:47:50 +02:00

mimeparse.py

…

psyco_full.py

…