Merge remote-tracking branch 'upstream/pull/1595'
authorTom Hughes <tom@compton.nu>
Thu, 27 Jul 2017 18:18:31 +0000 (19:18 +0100)
committerTom Hughes <tom@compton.nu>
Thu, 27 Jul 2017 18:18:31 +0000 (19:18 +0100)
commit555a821c3e1b79093b63b96e981c4766cf43baa9
treef1f46cb5666e3f8819213eae53daa88672df350f
parent34a918c59ef9768063ca30ff95c83aceedfda639
parent09ba878519c73d517fa88fc1c2cad1d1924fdf84
Merge remote-tracking branch 'upstream/pull/1595'
app/controllers/user_controller.rb