projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: db7374f 074031d)
Merge remote-tracking branch 'openstreetmap/pull/903'
authorTom Hughes <tom@compton.nu>
Thu, 27 Aug 2015 20:44:44 +0000 (21:44 +0100)
committerTom Hughes <tom@compton.nu>
Thu, 27 Aug 2015 20:44:44 +0000 (21:44 +0100)
1  2 
config/locales/en.yml patch | diff1 | diff2 | blob | history

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