closes #11995
authorradhika <radhika@curoverse.com>
Thu, 20 Jul 2017 17:04:50 +0000 (13:04 -0400)
committerradhika <radhika@curoverse.com>
Thu, 20 Jul 2017 17:04:50 +0000 (13:04 -0400)
commit0b51ce6bfc3c50155de18eb4440021688462fb6a
treea6fde6e9103bad4fafcf93a44d2f05053203f171
parent6cc4c2ed2e9503c07b33b8fb8469516af80b8a26
parent236a667953bc828576faa50af9d4d4225038f9e7
closes #11995

Merge branch '11995-collecion-filetypes'

Arvados-DCO-1.1-Signed-off-by: Radhika Chippada <radhika@curoverse.com>