Merge branch 'master' into openstreetbugs
authorTom Hughes <tom@compton.nu>
Thu, 20 Sep 2012 15:01:24 +0000 (16:01 +0100)
committerTom Hughes <tom@compton.nu>
Thu, 20 Sep 2012 15:01:24 +0000 (16:01 +0100)
commit4d91fe3dd95c1058cb8d24fd4c900223e30b9059
treecbf6201374d8c8fb8efded66392486d2a5aa4ea5
parentea63736b5c1b6e1d1adbf043f025cc9cb4171bcb
parent5c39e5870d5b31262644ef8e7d1b73dbe6f4e0b7
Merge branch 'master' into openstreetbugs

Conflicts:
Gemfile
app/helpers/application_helper.rb
app/views/site/index.html.erb
14 files changed:
Gemfile
Gemfile.lock
app/assets/javascripts/application.js
app/assets/stylesheets/common.css.scss
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/routes.rb