Merge remote-tracking branch 'upstream/pull/2014'
[rails.git] / app / controllers / users_controller.rb
2018-10-03 Tom HughesMerge remote-tracking branch 'upstream/pull/2014'
2018-10-03 Andy AllanRename user_controller to users_controller