Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 2d9ae75cae83969b3a708c0921ca33841ad08ef5 https://github.com/galaxyproject/galaxy/commit/2d9ae75cae83969b3a708c0921ca3... Author: John Chilton jmchilton@gmail.com Date: 2017-08-29 (Tue, 29 Aug 2017)
Changed paths: M lib/galaxy/datatypes/data.py
Log Message: ----------- Fix another bad merge issue?
Commit: 21eac0d445cbf8523cd48402d0992dc7ff1720c6 https://github.com/galaxyproject/galaxy/commit/21eac0d445cbf8523cd48402d0992... Author: Dannon Baker dannon.baker@gmail.com Date: 2017-08-30 (Wed, 30 Aug 2017)
Changed paths: M lib/galaxy/datatypes/data.py
Log Message: ----------- Merge pull request #4515 from jmchilton/another_merge_issue
Fix subdirectory listing for extra files
Compare: https://github.com/galaxyproject/galaxy/compare/d56fcf6777d9...21eac0d445cb