Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 0da2ac78e6ac5583271881dabd4b4d0a3bcf59cd https://github.com/galaxyproject/galaxy/commit/0da2ac78e6ac5583271881dabd4b4... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-02-22 (Wed, 22 Feb 2017) Changed paths: M static/maps/mvc/tool/tool-form-composite.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/tool/tool-form-composite.js Log Message: ----------- Rebuild client -- bad merge previously. Commit: 18e514d9b72b6efb57772009de1c0d65b791fa1b https://github.com/galaxyproject/galaxy/commit/18e514d9b72b6efb57772009de1c0... Author: Björn Grüning <bjoern@gruenings.eu> Date: 2017-02-22 (Wed, 22 Feb 2017) Changed paths: M static/maps/mvc/tool/tool-form-composite.js.map M static/scripts/bundled/analysis.bundled.js M static/scripts/bundled/analysis.bundled.js.map M static/scripts/bundled/libs.bundled.js.map M static/scripts/mvc/tool/tool-form-composite.js Log Message: ----------- Merge pull request #3652 from dannon/rebuild_client Rebuild client -- bad merge previously. Compare: https://github.com/galaxyproject/galaxy/compare/c52715fd69fb...18e514d9b72b