]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6ca7ab3 ba65dcc)
merge 19601:19888 of rails_port into the openID branch
authorKai Krueger <kakrueger@gmail.com>
Sat, 6 Feb 2010 13:13:52 +0000 (13:13 +0000)
committerKai Krueger <kakrueger@gmail.com>
Sat, 6 Feb 2010 13:13:52 +0000 (13:13 +0000)
1  2 
config/locales/en.yml patch | diff1 | diff2 | blob | history

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