Merge remote-tracking branch 'osmlab/user-display'
authorTom Hughes <tom@compton.nu>
Fri, 23 Aug 2013 16:40:57 +0000 (17:40 +0100)
committerTom Hughes <tom@compton.nu>
Fri, 23 Aug 2013 16:40:57 +0000 (17:40 +0100)
1  2 
app/views/layouts/site.html.erb

Simple merge