Merge remote-tracking branch 'upstream/pull/2161'
authorTom Hughes <tom@compton.nu>
Thu, 28 Feb 2019 19:17:40 +0000 (19:17 +0000)
committerTom Hughes <tom@compton.nu>
Thu, 28 Feb 2019 19:17:40 +0000 (19:17 +0000)
commit94b59f440321846760d430fee378f05a6a2803ee
treeb1bccfdb7a7bba12d8997e1726aff41cbe804821
parent73214da35de30b3466cf8d0ab751955ec9292ec4
parent5f59845575ed313688eca669fd73f4f6a5993c23
Merge remote-tracking branch 'upstream/pull/2161'
app/controllers/users_controller.rb