]> git.openstreetmap.org Git - rails.git/commit
Merge branch 'master' into notes
authorTom Hughes <tom@compton.nu>
Sat, 13 Oct 2012 14:55:34 +0000 (15:55 +0100)
committerTom Hughes <tom@compton.nu>
Sat, 13 Oct 2012 14:55:34 +0000 (15:55 +0100)
commit00375024263970a43ea7d39e3c65dfd0f32e8869
treec25008fbd1473d19eb491cdc07b7bb0a46de491e
parent4377418d53a668d369b38f298db46cb7ef68b0de
parent14bc538681ca1e6b54dc2da67718e67ea6e1ec04
Merge branch 'master' into notes

Conflicts:
Gemfile.lock
app/views/browse/_map.html.erb
app/views/site/index.html.erb
17 files changed:
Gemfile
Gemfile.lock
app/assets/javascripts/application.js
app/assets/javascripts/browse.js
app/assets/javascripts/notes.js.erb
app/assets/javascripts/osm.js.erb
app/assets/stylesheets/common.css.scss
app/controllers/browse_controller.rb
app/views/browse/_map.html.erb
app/views/site/index.html.erb
app/views/user/view.html.erb
config/locales/de.yml
config/locales/en.yml
config/openlayers.cfg
config/routes.rb
db/structure.sql
vendor/assets/openlayers/OpenLayers.js