User/Person models merge

2014-06-23 19:07:50 +03:00 · 2014-06-23 19:07:50 +03:00 · 23bf55b66c
commit 23bf55b66c
parent 66b84e3660
80 changed files with 1064 additions and 1221 deletions
--- a/app/views/admin/conference/_recent_users.html.haml
+++ b/app/views/admin/conference/_recent_users.html.haml
@ -20,4 +20,4 @@
                %span.label.label-danger Unconfirmed
 - else
  %h5.text-warning.text-center
-    No sign ups!
+    No sign ups!