]> git.openstreetmap.org Git - rails.git/commitdiff
Merge remote-tracking branch 'upstream/pull/1658'
authorTom Hughes <tom@compton.nu>
Tue, 24 Oct 2017 18:41:46 +0000 (19:41 +0100)
committerTom Hughes <tom@compton.nu>
Tue, 24 Oct 2017 18:41:46 +0000 (19:41 +0100)

Trivial merge