diff options
| author | kibigo! <marrus-sh@users.noreply.github.com> | 2017-10-11 10:43:10 -0700 |
|---|---|---|
| committer | kibigo! <marrus-sh@users.noreply.github.com> | 2017-10-11 10:43:10 -0700 |
| commit | 8d6b9ba4946b5b159af0fbd130637a226a286796 (patch) | |
| tree | 9def26711682d29338cfa1b081822029a01669eb /app/models/conversation_mute.rb | |
| parent | f0a2a6c875e9294f0ea1d4c6bc90529e41a2dc37 (diff) | |
| parent | 476e79b8e340c9103352a0799e102e4aca1a5593 (diff) | |
Merge upstream 2.0ish #165
Diffstat (limited to 'app/models/conversation_mute.rb')
| -rw-r--r-- | app/models/conversation_mute.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/conversation_mute.rb b/app/models/conversation_mute.rb index 79299b995..8d2399adf 100644 --- a/app/models/conversation_mute.rb +++ b/app/models/conversation_mute.rb @@ -3,9 +3,9 @@ # # Table name: conversation_mutes # -# id :integer not null, primary key -# account_id :integer not null # conversation_id :integer not null +# account_id :integer not null +# id :integer not null, primary key # class ConversationMute < ApplicationRecord |