]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3429f01 d0f2288)
Merging 17905:17944 from trunk.
authorMatt Amos <zerebubuth@gmail.com>
Fri, 2 Oct 2009 15:36:46 +0000 (15:36 +0000)
committerMatt Amos <zerebubuth@gmail.com>
Fri, 2 Oct 2009 15:36:46 +0000 (15:36 +0000)
1  2 
config/locales/en.yml patch | diff1 | diff2 | blob | history

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