Merge remote-tracking branch 'upstream/pull/2499'
authorTom Hughes <tom@compton.nu>
Thu, 9 Jan 2020 10:36:31 +0000 (10:36 +0000)
committerTom Hughes <tom@compton.nu>
Thu, 9 Jan 2020 10:36:31 +0000 (10:36 +0000)
1  2 
app/assets/stylesheets/common.scss
app/views/site/about.html.erb
config/locales/en.yml

Simple merge
Simple merge
Simple merge