mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-10-24 02:04:04 +08:00
Merge 15.07 into 15.10.
Merge remote-tracking branch 'jmchilton/release_15.07' into release_15.10 Conflicts: client/galaxy/scripts/mvc/history/multi-panel.js lib/galaxy/webapps/galaxy/controllers/external_service.py lib/galaxy/webapps/galaxy/controllers/forms.py lib/galaxy/webapps/galaxy/controllers/library_admin.py lib/galaxy/webapps/galaxy/controllers/request_type.py lib/galaxy/webapps/galaxy/controllers/requests_admin.py lib/galaxy/webapps/galaxy/controllers/requests_common.py lib/galaxy/webapps/galaxy/controllers/visualization.py lib/galaxy/webapps/reports/controllers/jobs.py lib/galaxy/webapps/reports/controllers/sample_tracking.py lib/galaxy/webapps/reports/controllers/workflows.py lib/tool_shed/grids/admin_grids.py lib/tool_shed/grids/repository_grids.py lib/tool_shed/grids/repository_review_grids.py static/maps/mvc/history/multi-panel.js.map static/maps/mvc/ui/ui-select-default.js.map static/scripts/mvc/collection/list-collection-creator.js static/scripts/mvc/collection/list-of-pairs-collection-creator.js static/scripts/mvc/dataset/dataset-li-edit.js static/scripts/mvc/dataset/dataset-li.js static/scripts/mvc/history/history-panel.js static/scripts/mvc/history/multi-panel.js static/scripts/mvc/list/list-panel.js static/scripts/mvc/ui/ui-select-default.js
This commit is contained in:
John Chilton