Merge remote-tracking branch 'upstream/pull/2444'
authorTom Hughes <tom@compton.nu>
Mon, 30 Dec 2019 22:34:24 +0000 (22:34 +0000)
committerTom Hughes <tom@compton.nu>
Mon, 30 Dec 2019 22:34:24 +0000 (22:34 +0000)
commit3426976606d30278fcf5ed279d3c95900785c4a5
treea0a947f607d608eb95bf4e05088d7b1b02347317
parent29aac6e14964d612ee6a06998ae61bc8923f5946
parent4596fa9420621e717d90782937aa3f0bee290964
Merge remote-tracking branch 'upstream/pull/2444'
app/controllers/site_controller.rb
config/routes.rb