summaryrefslogtreecommitdiff
path: root/app/views/tenants
diff options
context:
space:
mode:
authorspag <spag@golwen.net>2013-01-24 15:37:24 +0100
committerspag <spag@golwen.net>2013-01-24 15:37:24 +0100
commit99270421d02b3ac77bf111bbde62a2ef80f8e114 (patch)
tree6ddb8328729e53dcc7a605040cd7aece622d0e5a /app/views/tenants
parent5f5ea1d06686ec5cd31cf8b9db177191fa7e66fd (diff)
parent2d6ebf19e5cea45dd714f92a64b1b81e1200a811 (diff)
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/views/tenants')
-rw-r--r--app/views/tenants/_admin_area.html.haml4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/tenants/_admin_area.html.haml b/app/views/tenants/_admin_area.html.haml
index 92614c8..28a8273 100644
--- a/app/views/tenants/_admin_area.html.haml
+++ b/app/views/tenants/_admin_area.html.haml
@@ -11,11 +11,11 @@
= render :partial => 'tenants/table_of_hunt_groups', :locals => {:tenant => tenant}
= render :partial => 'tenants/table_of_automatic_call_distributors', :locals => {:tenant => tenant}
- = render :partial => 'tenants/table_of_phone_books', :locals => {:tenant => tenant}
-
= render :partial => 'tenants/users_table', :locals => {:tenant => tenant}
= render :partial => 'tenants/user_groups_table', :locals => {:tenant => tenant}
+ = render :partial => 'tenants/table_of_phone_books', :locals => {:tenant => tenant}
+
.well
%h2 Gemeinschaft Konfiguration
= render :partial => 'tenants/gs_parameter_table', :locals => {:tenant => tenant}