]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1e3b3c1 1db1f04)
Merging 17846:17904 from trunk.
authorMatt Amos <zerebubuth@gmail.com>
Thu, 1 Oct 2009 17:23:01 +0000 (17:23 +0000)
committerMatt Amos <zerebubuth@gmail.com>
Thu, 1 Oct 2009 17:23:01 +0000 (17:23 +0000)
1  2 
config/locales/en.yml patch | diff1 | diff2 | blob | history

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