Branch: refs/heads/release_18.05 Home: https://github.com/galaxyproject/galaxy Commit: b67ecd42097558a6fac347a163b3acf9d6fe121f https://github.com/galaxyproject/galaxy/commit/b67ecd42097558a6fac347a163b3a... Author: John Chilton <jmchilton@gmail.com> Date: 2018-05-02 (Wed, 02 May 2018) Changed paths: M lib/galaxy/tools/parameters/basic.py Log Message: ----------- Fix merge from 18.01. Commit: cacbcdf6755a1e930439d93021b08d27ff12318d https://github.com/galaxyproject/galaxy/commit/cacbcdf6755a1e930439d93021b08... Author: Dannon <dannon.baker@gmail.com> Date: 2018-05-02 (Wed, 02 May 2018) Changed paths: M lib/galaxy/tools/parameters/basic.py Log Message: ----------- Merge pull request #6039 from jmchilton/fix_1801_merge [18.05] Fix merge from 18.01. Compare: https://github.com/galaxyproject/galaxy/compare/e62fd46644a2...cacbcdf6755a **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/ Functionality will be removed from GitHub.com on January 31st, 2019.