diff options
author | David Yip <yipdw@member.fsf.org> | 2018-01-20 16:37:35 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-20 16:37:35 -0600 |
commit | 24b6e4121f656d24adc5676e8a207ded610a7ea7 (patch) | |
tree | 1c7b908468e12a40a6433f02f86f2cf47fa53cf9 /app/models/conversation_mute.rb | |
parent | b8c6656ce9e498f2e99d6301212bcd12e7f839df (diff) | |
parent | 3cae3622146d80aef8e43e5790d25f5e2fc9931e (diff) |
Merge pull request #342 from glitch-soc/merge-upstream
Merge upstream
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 248cdfe6e..272eb81af 100644 --- a/app/models/conversation_mute.rb +++ b/app/models/conversation_mute.rb @@ -9,6 +9,6 @@ # class ConversationMute < ApplicationRecord - belongs_to :account, required: true - belongs_to :conversation, required: true + belongs_to :account + belongs_to :conversation end |