]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e54f9ed 44b084d)
Merge branch 'master' into notes
authorTom Hughes <tom@compton.nu>
Mon, 15 Oct 2012 21:38:13 +0000 (22:38 +0100)
committerTom Hughes <tom@compton.nu>
Mon, 15 Oct 2012 21:38:13 +0000 (22:38 +0100)
1  2 
config/locales/en.yml patch | diff1 | diff2 | blob | history

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