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