]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5d8e192 90ac07d)
Merge remote-tracking branch 'upstream/pull/2225'
authorTom Hughes <tom@compton.nu>
Thu, 30 May 2019 17:06:58 +0000 (18:06 +0100)
committerTom Hughes <tom@compton.nu>
Thu, 30 May 2019 17:06:58 +0000 (18:06 +0100)
1  2 
config/locales/en.yml patch | diff1 | diff2 | blob | history
config/settings.yml patch | diff1 | diff2 | blob | history

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