projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f10a7f6
ab2550b
)
Merge branch 'master' into 2871-preload-objects
author
radhika <radhika@curoverse.com>
Tue, 3 Jun 2014 15:27:41 +0000
(11:27 -0400)
committer
radhika <radhika@curoverse.com>
Tue, 3 Jun 2014 15:27:41 +0000
(11:27 -0400)
1
2
apps/workbench/app/controllers/application_controller.rb
patch
|
diff1
|
diff2
|
blob
|
history
apps/workbench/app/helpers/application_helper.rb
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
apps/workbench/app/controllers/application_controller.rb
Simple merge
diff --cc
apps/workbench/app/helpers/application_helper.rb
Simple merge
projects / arvados.git / commitdiff