Merge branch 'master' into 4015-collection-chooser-portable-data-hash
authorTim Pierce <twp@curoverse.com>
Thu, 23 Oct 2014 22:35:19 +0000 (18:35 -0400)
committerTim Pierce <twp@curoverse.com>
Thu, 23 Oct 2014 22:35:19 +0000 (18:35 -0400)
commit87b2e5da50efa25671f1368e6cb162a5584fe030
tree8d7d5dc71af65028af3d85b214677fb2ebd54ae1
parent7086db26dce2ed43098daf1198a37412a5e42e48
parent587fcc936d7b5b0b8c16220a5932cf9441e02ab0
Merge branch 'master' into 4015-collection-chooser-portable-data-hash
apps/workbench/test/integration/pipeline_instances_test.rb
services/api/test/fixtures/collections.yml