mirror of
https://github.com/galaxyproject/galaxy.git
synced 2026-10-13 00:35:08 +08:00
Conflicts: client/galaxy/scripts/mvc/library/library-dataset-view.js static/maps/mvc/library/library-dataset-view.js.map static/maps/mvc/library/library-folder-view.js.map static/maps/mvc/library/library-library-view.js.map static/scripts/bundled/analysis.bundled.js.map static/scripts/bundled/libs.bundled.js.map static/scripts/mvc/library/library-dataset-view.js static/scripts/mvc/library/library-folder-view.js static/scripts/mvc/library/library-library-view.js