Merge branch 'master' into openstreetbugs
authorTom Hughes <tom@compton.nu>
Thu, 8 Mar 2012 18:23:27 +0000 (18:23 +0000)
committerTom Hughes <tom@compton.nu>
Thu, 8 Mar 2012 18:23:27 +0000 (18:23 +0000)
commite660e609661edadc1ed5ad49d6e83e936b2f91cd
treec6be589134b4fb5b1d2590a46aa3efb609a7b8e8
parentc29bcca57b9a05a3ca1e55d5b3a089c7ef0b1a03
parentcb5e6ebfaaa6e4b89ae259f502a6a3b2bc716d05
Merge branch 'master' into openstreetbugs

Conflicts:
Gemfile
Gemfile.lock
lib/migrate.rb
12 files changed:
Gemfile
Gemfile.lock
app/assets/stylesheets/common.css.scss
app/assets/stylesheets/large.css
app/helpers/application_helper.rb
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
lib/migrate.rb