projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5b2e3d9
cca0d86
)
refs #6588
author
Manoj <jonam33@gmail.com>
Tue, 4 Aug 2015 20:01:08 +0000
(16:01 -0400)
committer
Manoj <jonam33@gmail.com>
Tue, 4 Aug 2015 20:01:08 +0000
(16:01 -0400)
Merge branch '6588-split-manage-account'
1
2
apps/workbench/app/views/layouts/body.html.erb
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
apps/workbench/app/views/layouts/body.html.erb
Simple merge