projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a0a03c3
8d33353
)
Merge branch 'master' into 3138-wiselinks
author
radhika <radhika@curoverse.com>
Mon, 21 Jul 2014 16:03:05 +0000
(12:03 -0400)
committer
radhika <radhika@curoverse.com>
Mon, 21 Jul 2014 16:03:05 +0000
(12:03 -0400)
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