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)
commit0d3a9ed9cb47ce3b89ea9eaffbb589f9a9ff6d22
treea2a3cb46ca3524ea2c6c99e7722e0203212825ad
parentfe16fec000e8f26127f656bf68c513f2745b4059
parenta9a5b6ef38aeddcae590dfc53763ac303cadb8b0
Merge branch 'master' into openstreetbugs

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
18 files changed:
Gemfile
Gemfile.lock
app/assets/stylesheets/common.css.scss
app/assets/stylesheets/large.css
app/controllers/browse_controller.rb
app/helpers/application_helper.rb
app/models/user.rb
app/views/browse/_map.html.erb
app/views/site/index.html.erb
app/views/user/view.html.erb
config/example.application.yml
config/locales/de.yml
config/locales/en.yml
config/openlayers.cfg
config/routes.rb
db/structure.sql
test/functional/browse_controller_test.rb
vendor/assets/openlayers/OpenLayers.js