Merge branch '8766-cwl-collection-project' into 8654-arv-jobs-cwl-runner
authorPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 23 Mar 2016 14:52:38 +0000 (10:52 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 23 Mar 2016 14:52:38 +0000 (10:52 -0400)
Conflicts:
sdk/cwl/arvados_cwl/__init__.py

1  2 
sdk/cwl/arvados_cwl/__init__.py

Simple merge