Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 85a0a0b7bbc14c57f7759ae7b1d893da341fece5 https://github.com/galaxyproject/galaxy/commit/85a0a0b7bbc14c57f7759ae7b1d89... Author: Dannon Baker dannon.baker@gmail.com Date: 2016-05-03 (Tue, 03 May 2016)

Changed paths: M client/grunt-tasks/scripts.js M client/grunt-tasks/style.js

Log Message: ----------- Make grunt watch (for scripts) work again, settings were being overwritten by the new watch-style command

Commit: cbf569c417e6920d573a63c929c3aa0f594946c2 https://github.com/galaxyproject/galaxy/commit/cbf569c417e6920d573a63c929c3a... Author: Martin Cech cech.marten@gmail.com Date: 2016-05-03 (Tue, 03 May 2016)

Changed paths: M client/grunt-tasks/scripts.js M client/grunt-tasks/style.js

Log Message: ----------- Merge pull request #2296 from dannon/watch_fix

Make grunt watch (for scripts) work again, settings were being overwr…

Compare: https://github.com/galaxyproject/galaxy/compare/13c7143119bd...cbf569c417e6