Merge remote-tracking branch 'upstream/pull/2507'
authorTom Hughes <tom@compton.nu>
Wed, 15 Jan 2020 14:19:11 +0000 (14:19 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 15 Jan 2020 14:19:11 +0000 (14:19 +0000)
1  2 
app/assets/stylesheets/common.scss

Simple merge