Nicola Soranzo d807ed0f75 Merge branch 'release_17.05' into dev ...

Conflicts:
	static/scripts/bundled/analysis.bundled.js
	static/scripts/bundled/analysis.bundled.js.map
	static/scripts/bundled/libs.bundled.js
	static/scripts/bundled/libs.bundled.js.map
	static/scripts/bundled/login.bundled.js.map

2017-06-02 15:05:14 +01:00

..

galaxy

Merge branch 'release_17.05' into dev

2017-06-02 15:05:14 +01:00

galaxy_ext

Fix setting metadata in galaxy.json for working directory isolation change.

2016-08-04 13:36:38 -04:00

tool_shed

Merge branch 'release_17.05' into dev

2017-05-24 10:47:20 -04:00

log_tempfile.py

…

mimeparse.py

Fixes for pycodestyle 2.2.0

2016-11-15 16:56:50 +00:00

psyco_full.py

…