Merge remote-tracking branch 'upstream/pull/1707'
authorTom Hughes <tom@compton.nu>
Sat, 13 Jan 2018 10:35:42 +0000 (10:35 +0000)
committerTom Hughes <tom@compton.nu>
Sat, 13 Jan 2018 10:35:42 +0000 (10:35 +0000)
commit9cf698322ce70e2fdb718be6624b0ac4e8eaf285
tree1da8e2f8c659cda93f5cbe91d5fd4801e402d6ae
parentd98741690124a266da0d1a0cfe348f7ec78e5e9f
parentca36cf28266418a5b9fdf97dbe455436857e7f9a
Merge remote-tracking branch 'upstream/pull/1707'
app/controllers/application_controller.rb