projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
69a1f28
010a56c
)
Merge branch 'master' into 2756-eventbus-in-workbench
author
radhika <radhika@curoverse.com>
Tue, 27 May 2014 15:16:22 +0000
(11:16 -0400)
committer
radhika <radhika@curoverse.com>
Tue, 27 May 2014 15:16:22 +0000
(11:16 -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