Merge remote-tracking branch 'upstream/pull/1974'
[rails.git] / app / views / user / show.html.erb