Merge branch 'master' into redesign
[rails.git] / app / views / user /
drwxr-xr-x   ..
-rw-r--r-- 2283 _contact.html.erb
-rw-r--r-- 224 _popup.html.erb
-rw-r--r-- 1090 _terms.html.erb
-rw-r--r-- 902 _user.html.erb
-rw-r--r-- 8055 account.html.erb
-rw-r--r-- 2034 api_read.builder
-rw-r--r-- 180 blocked.html.erb
-rw-r--r-- 967 confirm.html.erb
-rw-r--r-- 466 confirm_email.html.erb
-rw-r--r-- 0 index.html.erb
-rw-r--r-- 1611 list.html.erb
-rw-r--r-- 3557 login.html.erb
-rw-r--r-- 308 logout.html.erb
-rw-r--r-- 460 lost_password.html.erb
-rw-r--r-- 298 make_friend.html.erb
-rw-r--r-- 3360 new.html.erb
-rw-r--r-- 187 no_such_user.html.erb
-rw-r--r-- 298 remove_friend.html.erb
-rw-r--r-- 749 reset_password.html.erb
-rw-r--r-- 19 save.html.erb
-rw-r--r-- 254 suspended.html.erb
-rw-r--r-- 2159 terms.html.erb
-rw-r--r-- 10633 view.html.erb