]> git.openstreetmap.org Git - rails.git/commitdiff
Merge remote-tracking branch 'upstream/pull/2498'
authorTom Hughes <tom@compton.nu>
Thu, 9 Jan 2020 10:31:37 +0000 (10:31 +0000)
committerTom Hughes <tom@compton.nu>
Thu, 9 Jan 2020 10:31:37 +0000 (10:31 +0000)
1  2 
app/assets/stylesheets/_bootstrap-custom.scss
app/assets/stylesheets/common.scss

Simple merge