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)
commitfa339033e1f00f4f3e2b9c790c5100a863cf91ac
tree9d51c0e0bc0a390258413cb433f93232f475e962
parentbd1d0ab9507b71fc9db19a8a2656bd6d149737c7
parent5965a89dd97fc58cd7b544d49ec32cfb1ae8c39e
Merge remote-tracking branch 'osmlab/user-display'
app/views/layouts/site.html.erb