Merge remote-tracking branch 'upstream/pull/2505'
authorTom Hughes <tom@compton.nu>
Wed, 15 Jan 2020 12:17:10 +0000 (12:17 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 15 Jan 2020 12:17:10 +0000 (12:17 +0000)
commit50b2f4f656b82112fce4939da26a1afc6b140e89
tree45c4d066a91357573cf041c5ffaa3e52a6ed3e91
parent6049a2d2744094dcf8fe9ad6085fc3f01e4bc912
parent3776a6d321997039ad640e897d952f3f50efb29a
Merge remote-tracking branch 'upstream/pull/2505'
app/assets/stylesheets/common.scss