diff options
author | nfoy <nfoy@purdue.edu> | 2014-04-24 19:15:27 -0400 |
---|---|---|
committer | nfoy <nfoy@purdue.edu> | 2014-04-24 19:15:27 -0400 |
commit | ddfe11c0444cf424cad3d14bc9be48d32423f3dd (patch) | |
tree | 135db4cd6bf22380953315ea1244f720a5419e2d /app/views/pms/show.json.jbuilder | |
parent | 1b11684986136ee87da6242c3ba6aba5ef581510 (diff) | |
parent | 67d95e5b92e3d19765c7ccaf5460737ffe2173f4 (diff) |
Merge branch 'clean2'
Conflicts:
app/models/pm.rb
app/views/pms/index.html.erb
app/views/pms/show.html.erb
Diffstat (limited to 'app/views/pms/show.json.jbuilder')
-rw-r--r-- | app/views/pms/show.json.jbuilder | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/pms/show.json.jbuilder b/app/views/pms/show.json.jbuilder index 94252e9..4e69026 100644 --- a/app/views/pms/show.json.jbuilder +++ b/app/views/pms/show.json.jbuilder @@ -1 +1 @@ -json.extract! @pm, :id, :author_id, :recipient_id, :message, :created_at, :updated_at +json.extract! @pm, :id, :author_id, :recipient_id, :message, :subject, :conversation_id, :created_at, :updated_at |