diff options
author | guntasgrewal <guntasgrewal@gmail.com> | 2014-04-24 19:22:33 -0400 |
---|---|---|
committer | guntasgrewal <guntasgrewal@gmail.com> | 2014-04-24 19:22:33 -0400 |
commit | f14410d0e7ea249971265f3466ec246c62e6f3f5 (patch) | |
tree | e459190532683018c1bd24070fe01ad474c2ec08 /app/models | |
parent | b5cc531c9c5d2f7ab9066bbe732dad730cc063d9 (diff) | |
parent | 379cf06b33c672e01845c9c826ce58f8517059bd (diff) |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/pm.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/pm.rb b/app/models/pm.rb index 3ebb69d..8b06181 100644 --- a/app/models/pm.rb +++ b/app/models/pm.rb @@ -1,6 +1,7 @@ class Pm < ActiveRecord::Base belongs_to :author, class_name: "User" belongs_to :recipient, class_name: "User" + belongs_to :conversation def name return current_user.name |