mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-10-16 07:19:13 +08:00
Conflicts: client/galaxy/scripts/mvc/upload/upload-view.js static/maps/mvc/upload/upload-view.js.map static/scripts/mvc/upload/upload-view.js static/style/blue/base.css