projects
/
rails.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bd1d0ab
5965a89
)
Merge remote-tracking branch 'osmlab/user-display'
author
Tom Hughes
<tom@compton.nu>
Fri, 23 Aug 2013 16:40:57 +0000
(17:40 +0100)
committer
Tom Hughes
<tom@compton.nu>
Fri, 23 Aug 2013 16:40:57 +0000
(17:40 +0100)
1
2
app/views/layouts/site.html.erb
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
app/views/layouts/site.html.erb
Simple merge