Files
galaxy/test/functional
Martin Cech 387805fc13 Merge branch 'release_17.01' into dev
Conflicts:
	client/galaxy/scripts/mvc/tool/tool-form-composite.js
    preserved the dev version

	static/maps/mvc/tool/tool-form-composite.js.map
	static/scripts/bundled/analysis.bundled.js
	static/scripts/bundled/analysis.bundled.js.map
	static/scripts/bundled/libs.bundled.js.map
	static/scripts/mvc/tool/tool-form-composite.js
2017-02-22 10:54:08 -05:00
..