projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
093cebc
53381c9
)
Merge branch 'master' into 3400-workbench-all-items
author
Peter Amstutz <peter.amstutz@curoverse.com>
Wed, 12 Nov 2014 18:14:10 +0000
(13:14 -0500)
committer
Peter Amstutz <peter.amstutz@curoverse.com>
Wed, 12 Nov 2014 18:14:10 +0000
(13:14 -0500)
1
2
apps/workbench/app/controllers/application_controller.rb
patch
|
diff1
|
diff2
|
blob
|
history
apps/workbench/app/controllers/collections_controller.rb
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
apps/workbench/app/controllers/application_controller.rb
Simple merge
diff --cc
apps/workbench/app/controllers/collections_controller.rb
Simple merge
projects / arvados.git / commitdiff