projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b6bb61b
b45c3b2
)
Merge branch '1692-redesign-dashboard'
author
Peter Amstutz <peter.amstutz@curoverse.com>
Tue, 31 Dec 2013 15:09:47 +0000
(10:09 -0500)
committer
Peter Amstutz <peter.amstutz@curoverse.com>
Tue, 31 Dec 2013 15:09:47 +0000
(10:09 -0500)
1
2
apps/workbench/app/controllers/application_controller.rb
patch
|
diff1
|
diff2
|
blob
|
history
apps/workbench/app/views/layouts/application.html.erb
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
apps/workbench/app/controllers/application_controller.rb
Simple merge
diff --cc
apps/workbench/app/views/layouts/application.html.erb
Simple merge
projects / arvados.git / commitdiff