]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6d668f6 a2b438f)
Merge -r 20198:20540 from trunc into openstreetbugs branch
authorKai Krueger <kakrueger@gmail.com>
Thu, 18 Mar 2010 12:42:23 +0000 (12:42 +0000)
committerKai Krueger <kakrueger@gmail.com>
Thu, 18 Mar 2010 12:42:23 +0000 (12:42 +0000)
1  2 
config/environment.rb patch | diff1 | diff2 | blob | history
config/locales/en.yml patch | diff1 | diff2 | blob | history

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