diff options
author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-06 13:19:20 -0400 |
---|---|---|
committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-06 13:19:20 -0400 |
commit | 82840d22116835474614b80ebe72c282bcfc5f5e (patch) | |
tree | ea24c3648274c664ba014f28356ae353d049b643 /app/views/servers/show.json.jbuilder | |
parent | 0d42079611ed2aeacd71b926580fdc3b943cf1ba (diff) | |
parent | d2e4f58410c20f5e7b9e8e0dde3fd55d201af4bb (diff) |
Merge branch 'clean2'
Conflicts:
app/views/servers/show.html.erb
Diffstat (limited to 'app/views/servers/show.json.jbuilder')
-rw-r--r-- | app/views/servers/show.json.jbuilder | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/servers/show.json.jbuilder b/app/views/servers/show.json.jbuilder index 972b1c0..c566f76 100644 --- a/app/views/servers/show.json.jbuilder +++ b/app/views/servers/show.json.jbuilder @@ -1 +1 @@ -json.extract! @server, :id, :created_at, :updated_at +json.extract! @server, :id, :default_user_permissions, :created_at, :updated_at |