]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5dcd2ad f8119bf)
Merge branch 'master' of git://git.openstreetmap.org/rails
authorSiebrand Mazeland <s.mazeland@xs4all.nl>
Thu, 29 Apr 2010 20:58:18 +0000 (22:58 +0200)
committerSiebrand Mazeland <s.mazeland@xs4all.nl>
Thu, 29 Apr 2010 20:58:18 +0000 (22:58 +0200)
1  2 
config/locales/is.yml patch | diff1 | diff2 | blob | history

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