projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b15e80c
d95bc29
)
Merge branch '3627-selectable-projects' closes #3627
author
Tom Clegg <tom@curoverse.com>
Tue, 26 Aug 2014 23:51:26 +0000
(19:51 -0400)
committer
Tom Clegg <tom@curoverse.com>
Tue, 26 Aug 2014 23:51:26 +0000
(19:51 -0400)
1
2
apps/workbench/app/controllers/application_controller.rb
patch
|
diff1
|
diff2
|
blob
|
history
apps/workbench/app/views/projects/show.html.erb
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
apps/workbench/app/controllers/application_controller.rb
Simple merge
diff --cc
apps/workbench/app/views/projects/show.html.erb
Simple merge