projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw (from: 32b97ae)
Merge branch 'master' into 2875-pipeline-description
authorradhika <radhika@curoverse.com>
Fri, 12 Sep 2014 17:23:06 +0000 (13:23 -0400)
committerradhika <radhika@curoverse.com>
Fri, 12 Sep 2014 17:23:06 +0000 (13:23 -0400)
Conflicts:
services/api/app/models/pipeline_instance.rb
services/api/db/structure.sql


No differences found