]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 92af0ec 4d1fa7a)
Merge branch 'master' of git://git.openstreetmap.org/rails into openID
authorKai Krueger <kakrueger@gmail.com>
Sun, 2 May 2010 10:15:13 +0000 (11:15 +0100)
committerKai Krueger <kakrueger@gmail.com>
Sun, 2 May 2010 10:15:13 +0000 (11:15 +0100)
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