Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 991e069ef284e7669e5dece818aef510189b2d15 https://github.com/galaxyproject/galaxy/commit/991e069ef284e7669e5dece818aef... Author: Bjoern Gruening bjoern.gruening@gmail.com Date: 2016-03-29 (Tue, 29 Mar 2016)

Changed paths: M config/datatypes_conf.xml.sample

Log Message: ----------- enable obfs datatype during upload

Commit: aee2ed98a01ef9f93623dc33b0b5730c3fbfc30b https://github.com/galaxyproject/galaxy/commit/aee2ed98a01ef9f93623dc33b0b57... Author: John Chilton jmchilton@gmail.com Date: 2016-03-29 (Tue, 29 Mar 2016)

Changed paths: M config/datatypes_conf.xml.sample

Log Message: ----------- Merge pull request #2028 from bgruening/obfs_in_upload

enable obfs datatype during upload

Compare: https://github.com/galaxyproject/galaxy/compare/ad12042f5f17...aee2ed98a01e