]> git.openstreetmap.org Git - rails.git/commitdiff
Merge branch 'redesign'
authorTom Hughes <tom@compton.nu>
Thu, 28 Nov 2013 17:30:53 +0000 (17:30 +0000)
committerTom Hughes <tom@compton.nu>
Thu, 28 Nov 2013 17:30:53 +0000 (17:30 +0000)
Conflicts:
app/assets/stylesheets/common.css.scss

1  2 
app/views/site/_id.html.erb
config/locales/el.yml
config/locales/et.yml
config/locales/he.yml
config/locales/nl.yml
config/locales/pt-BR.yml

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge