]> git.openstreetmap.org Git - rails.git/commitdiff
Merge remote-tracking branch 'upstream/pull/1726'
authorTom Hughes <tom@compton.nu>
Mon, 29 Jan 2018 18:54:18 +0000 (18:54 +0000)
committerTom Hughes <tom@compton.nu>
Mon, 29 Jan 2018 18:54:18 +0000 (18:54 +0000)

Trivial merge