Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 2ede34659b688089ed549ea24416f7610be0a698 https://github.com/galaxyproject/galaxy/commit/2ede34659b688089ed549ea24416f... Author: John Chilton jmchilton@gmail.com Date: 2017-08-28 (Mon, 28 Aug 2017)

Changed paths: M lib/galaxy/datatypes/data.py

Log Message: ----------- Fix bad merge of security patch from 17.05 into dev.

Commit: d56fcf6777d93c83db5ebbc4af7968cb9889e524 https://github.com/galaxyproject/galaxy/commit/d56fcf6777d93c83db5ebbc4af796... Author: Dannon Baker dannon.baker@gmail.com Date: 2017-08-28 (Mon, 28 Aug 2017)

Changed paths: M lib/galaxy/datatypes/data.py

Log Message: ----------- Merge pull request #4508 from jmchilton/dev_merge_fix

Fix bad merge of security patch from 17.05 into dev.

Compare: https://github.com/galaxyproject/galaxy/compare/15b1a41df839...d56fcf6777d9