Branch: refs/heads/release_16.01 Home: https://github.com/galaxyproject/galaxy Commit: 20f61e6a2f36967e16a92cbcf8ad7f81ca76fb29 https://github.com/galaxyproject/galaxy/commit/20f61e6a2f36967e16a92cbcf8ad7... Author: Marius van den Beek m.vandenbeek@gmail.com Date: 2016-04-04 (Mon, 04 Apr 2016)

Changed paths: M lib/galaxy/workflow/modules.py

Log Message: ----------- workaround for error message in case original toolshed had been disabled

Commit: 65a7ebee23364a89d72e528bfcde6b1f6b3c5cd9 https://github.com/galaxyproject/galaxy/commit/65a7ebee23364a89d72e528bfcde6... Author: Martin Cech cech.marten@gmail.com Date: 2016-04-04 (Mon, 04 Apr 2016)

Changed paths: M lib/galaxy/workflow/modules.py

Log Message: ----------- Merge pull request #2072 from mvdbeek/backport_1738

[16.01] backport #1738

Compare: https://github.com/galaxyproject/galaxy/compare/90b95dc665bd...65a7ebee2336