Merge branch 'master' into next

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

diff --git a/app/views/user/index.html.erb b/app/views/user/index.html.erb
deleted file mode 100644 (file)
index e69de29..0000000