]> git.openstreetmap.org Git - rails.git/commitdiff
Merge remote-tracking branch 'upstream/pull/2698'
authorTom Hughes <tom@compton.nu>
Wed, 8 Jul 2020 18:10:01 +0000 (19:10 +0100)
committerTom Hughes <tom@compton.nu>
Wed, 8 Jul 2020 18:10:01 +0000 (19:10 +0100)
1  2 
app/assets/stylesheets/common.scss
app/assets/stylesheets/small.scss

Simple merge
Simple merge