projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
289e5d1
6b0ad58
)
Merge branch 'master' into 3504-clients-compatible-with-3036
author
Peter Amstutz <peter.amstutz@curoverse.com>
Tue, 19 Aug 2014 15:05:33 +0000
(11:05 -0400)
committer
Peter Amstutz <peter.amstutz@curoverse.com>
Tue, 19 Aug 2014 15:05:33 +0000
(11:05 -0400)
1
2
apps/workbench/app/controllers/collections_controller.rb
patch
|
diff1
|
diff2
|
blob
|
history
apps/workbench/app/views/collections/show.html.erb
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
apps/workbench/app/controllers/collections_controller.rb
Simple merge
diff --cc
apps/workbench/app/views/collections/show.html.erb
Simple merge
projects / arvados.git / commitdiff