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/layouts/_admin_sidebar_index.html.haml
+++ b/app/views/layouts/_admin_sidebar_index.html.haml
@ -24,7 +24,3 @@
    = link_to(admin_users_path) do
      %span.glyphicon.glyphicon-user
      Users
-  %li
-    = link_to(admin_people_path) do
-      %span.glyphicon.glyphicon-star-empty
-      People