]> git.openstreetmap.org Git - rails.git/commitdiff
Merge branch 'master' into openstreetbugs
authorTom Hughes <tom@compton.nu>
Wed, 28 Jul 2010 20:30:55 +0000 (21:30 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 28 Jul 2010 20:30:55 +0000 (21:30 +0100)
1  2 
config/environment.rb
config/locales/en.yml

Simple merge
Simple merge