projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
fb8dd22
7ca81ca
)
2762: Merge branch 'master' into 2762-owner-uuid-integrity
author
Tom Clegg <tom@curoverse.com>
Wed, 14 May 2014 22:02:51 +0000
(18:02 -0400)
committer
Tom Clegg <tom@curoverse.com>
Wed, 14 May 2014 22:02:51 +0000
(18:02 -0400)
1
2
services/api/app/models/pipeline_instance.rb
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
services/api/app/models/pipeline_instance.rb
Simple merge