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)
commit928465764e52407884b35e31a08bf9241e651269
tree0158a05ea3c21c4028cbc34cb0f70ccb91f7dbd5
parente39d227dd03f43985e38cd26ce6040772d571271
parent304deb3ca7adb17b412b0fda4fad10d73d0b90b6
Merge remote-tracking branch 'upstream/pull/2499'
app/assets/stylesheets/common.scss
app/views/site/about.html.erb
config/locales/en.yml