Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 3b69c645dab86332c506bd0e510de77d6e7dc215 https://github.com/galaxyproject/galaxy/commit/3b69c645dab86332c506bd0e510de... Author: Nicola Soranzo nsoranzo@tiscali.it Date: 2018-01-25 (Thu, 25 Jan 2018)

Changed paths: M lib/galaxy/version.py

Log Message: ----------- Merge pull request #5387 from martenson/version-18.01

[18.01] Update version to 18.01.rc1

Commit: 9c187f0e5a613c925a733f6aeacd7e07f143f25b https://github.com/galaxyproject/galaxy/commit/9c187f0e5a613c925a733f6aeacd7... Author: Dannon Baker dannon.baker@gmail.com Date: 2018-01-25 (Thu, 25 Jan 2018)

Changed paths: M lib/galaxy/model/mapping.py

Log Message: ----------- Constrain workflow tool panel entries to those not deleted.

Commit: 17fe5d635afb7ccb773370511faee72f11860045 https://github.com/galaxyproject/galaxy/commit/17fe5d635afb7ccb773370511faee... Author: Dannon Baker dannon.baker@gmail.com Date: 2018-01-26 (Fri, 26 Jan 2018)

Log Message: ----------- Merge branch 'release_17.09' into release_18.01

Commit: 28f5aca05695bab1a3608fbbcc93bd3f09c1eb28 https://github.com/galaxyproject/galaxy/commit/28f5aca05695bab1a3608fbbcc93b... Author: Dannon Baker dannon.baker@gmail.com Date: 2018-01-26 (Fri, 26 Jan 2018)

Log Message: ----------- Merge branch 'release_18.01' into dev

Compare: https://github.com/galaxyproject/galaxy/compare/792a07148915...28f5aca05695