projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d519091
8630c54
)
Merge branch 'master' into 9318-dashboard-uses-work-units
author
radhika <radhika@curoverse.com>
Wed, 8 Jun 2016 03:26:46 +0000
(23:26 -0400)
committer
radhika <radhika@curoverse.com>
Wed, 8 Jun 2016 03:26:46 +0000
(23:26 -0400)
1
2
apps/workbench/app/models/proxy_work_unit.rb
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
apps/workbench/app/models/proxy_work_unit.rb
Simple merge