]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f28f28f feb9582)
Merge branch 'master' into openID
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Tue, 27 Apr 2010 20:03:03 +0000 (20:03 +0000)
committerÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Tue, 27 Apr 2010 20:03:03 +0000 (20:03 +0000)
1  2 
config/locales/en.yml patch | diff1 | diff2 | blob | history

diff --cc config/locales/en.yml
Simple merge
The OpenStreetMap web site