]> git.openstreetmap.org Git - rails.git/commitdiff
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)
1  2 
app/controllers/site_controller.rb
config/routes.rb

Simple merge
Simple merge