projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5d33c55
3f3c680
)
Merge branch 'master' into 2096-demo-feedback
author
Tom Clegg <tom@curoverse.com>
Wed, 12 Feb 2014 19:57:50 +0000
(11:57 -0800)
committer
Tom Clegg <tom@curoverse.com>
Wed, 12 Feb 2014 19:57:50 +0000
(11:57 -0800)
1
2
apps/workbench/app/views/layouts/application.html.erb
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
apps/workbench/app/views/layouts/application.html.erb
Simple merge