projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2b50a58
05428b7
)
Merge branch 'master' into 9766-register-workflow
author
Peter Amstutz <peter.amstutz@curoverse.com>
Wed, 14 Sep 2016 12:35:15 +0000
(08:35 -0400)
committer
Peter Amstutz <peter.amstutz@curoverse.com>
Wed, 14 Sep 2016 12:35:15 +0000
(08:35 -0400)
1
2
apps/workbench/app/controllers/work_units_controller.rb
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
apps/workbench/app/controllers/work_units_controller.rb
Simple merge