]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 0d3a9ed)
Merge branch 'master' into openstreetbugs
authorTom Hughes <tom@compton.nu>
Wed, 22 Aug 2012 19:52:08 +0000 (20:52 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 22 Aug 2012 19:52:08 +0000 (20:52 +0100)
Conflicts:
Gemfile.lock
app/views/browse/_map.html.erb
app/views/user/view.html.erb
config/locales/en.yml
config/openlayers.cfg
db/structure.sql
vendor/assets/openlayers/OpenLayers.js


No differences found
The OpenStreetMap web site