]> git.openstreetmap.org Git - rails.git/commitdiff
Merge remote-tracking branch 'upstream/pull/2469'
authorTom Hughes <tom@compton.nu>
Mon, 30 Dec 2019 21:29:00 +0000 (21:29 +0000)
committerTom Hughes <tom@compton.nu>
Mon, 30 Dec 2019 21:29:00 +0000 (21:29 +0000)
1  2 
app/assets/stylesheets/common.scss

Simple merge