diff options
| author | guntasgrewal <guntasgrewal@gmail.com> | 2014-04-06 20:09:54 -0400 |
|---|---|---|
| committer | guntasgrewal <guntasgrewal@gmail.com> | 2014-04-06 20:09:54 -0400 |
| commit | f3c395c56a644d976aa9a5608300557600bc683e (patch) | |
| tree | 83cb961a721fa8c50903c70bb08ae14dd15ca58c /app/views/servers/show.html.erb | |
| parent | 7575d8cc70a28b323db0486ed06ab8af33b1f21a (diff) | |
| parent | f85943114dba527a1f87abb03229553472f57c0c (diff) | |
solved merge conflicts
Diffstat (limited to 'app/views/servers/show.html.erb')
| -rw-r--r-- | app/views/servers/show.html.erb | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/app/views/servers/show.html.erb b/app/views/servers/show.html.erb index 67f7647..54aaf66 100644 --- a/app/views/servers/show.html.erb +++ b/app/views/servers/show.html.erb @@ -1,2 +1,6 @@ -<%= link_to 'Edit', edit_server_path(@server) %> | -<%= link_to 'Back', servers_path %> +<p> + <strong>Default user permissions:</strong> + <%= @server.default_user_permissions %> +</p> + +<%= link_to 'Edit', edit_server_path %> |