projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bdabb9a
5f3ac75
)
Merge branch 'master' into 6588-split-manage-account
author
Manoj <jonam33@gmail.com>
Wed, 5 Aug 2015 16:28:38 +0000
(12:28 -0400)
committer
Manoj <jonam33@gmail.com>
Wed, 5 Aug 2015 16:28:38 +0000
(12:28 -0400)
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