Merge branch '11948-cwl-conformance-fix'
authorTom Clegg <tom@curoverse.com>
Thu, 13 Jul 2017 19:33:39 +0000 (15:33 -0400)
committerTom Clegg <tom@curoverse.com>
Thu, 13 Jul 2017 19:33:39 +0000 (15:33 -0400)
commita95c9948e04eab66cbb3aa4e93776c52956fc807
tree7289b724b5f2db5c6747c04785eccd7ced9be5f5
parentb6ad461076bdc4830fe08c01d70ed3def1ec6b55
parent2feec8cbac7ef28a47f3c3a9d071b070ef38cb6e
Merge branch '11948-cwl-conformance-fix'

refs #11948

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curoverse.com>