]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 415a05f c233bec)
Merge remote-tracking branch 'upstream/pull/2901'
authorTom Hughes <tom@compton.nu>
Wed, 21 Oct 2020 19:51:03 +0000 (20:51 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 21 Oct 2020 19:51:03 +0000 (20:51 +0100)
1  2 
app/views/browse/changeset.html.erb patch | diff1 | diff2 | blob | history
config/locales/en.yml patch | diff1 | diff2 | blob | history

diff --cc app/views/browse/changeset.html.erb
Simple merge
diff --cc config/locales/en.yml
Simple merge
The OpenStreetMap web site