projects
/
arvados.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
78960aa
86f994b
)
Merge branch 'master' into 4525-remove-stale-clippy-code
author
radhika <radhika@radhika>
Thu, 4 Dec 2014 17:25:51 +0000
(12:25 -0500)
committer
radhika <radhika@radhika>
Thu, 4 Dec 2014 17:25:51 +0000
(12:25 -0500)
1
2
apps/workbench/app/helpers/application_helper.rb
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
apps/workbench/app/helpers/application_helper.rb
Simple merge