Merge remote-tracking branch 'upstream/pull/1974'

[rails.git] / app / views / user / show.html.erb

diff --git a/app/views/user/view.html.erb b/app/views/user/show.html.erb
similarity index 100%
rename from app/views/user/view.html.erb
rename to app/views/user/show.html.erb