Merge remote-tracking branch 'osmlab/map-ui'
authorTom Hughes <tom@compton.nu>
Tue, 6 Aug 2013 08:05:59 +0000 (09:05 +0100)
committerTom Hughes <tom@compton.nu>
Tue, 6 Aug 2013 08:05:59 +0000 (09:05 +0100)
commitfeeb135760abdbfef0eea193318566d9d96f2523
treeef9197bf6bf0ddaea349de8cc5d7e7769de14818
parentd4135390acff291f2f2c15d9fb86723ebf4fe755
parent34e251c225c7903b64f1fda2b594dd1c70aeeb93
Merge remote-tracking branch 'osmlab/map-ui'
app/assets/javascripts/application.js
app/assets/javascripts/index.js