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 /test/fixtures | |
| 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 'test/fixtures')
| -rw-r--r-- | test/fixtures/pms.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/test/fixtures/pms.yml b/test/fixtures/pms.yml index f77e727..ba31b86 100644 --- a/test/fixtures/pms.yml +++ b/test/fixtures/pms.yml @@ -4,8 +4,12 @@ one: author_id: recipient_id: message: MyText + subject: MyText + conversation_id: two: author_id: recipient_id: message: MyText + subject: MyText + conversation_id: |