diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-11-17 17:58:13 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-17 17:58:13 -0600 |
| commit | 284e2cde81811d6289dde9542f9c987062f9e7c2 (patch) | |
| tree | 739fe0417fce9b9f48f924815b436a50b324dfe9 /app/models/account_moderation_note.rb | |
| parent | 6f8ccbfcdf7fd8ca651d1583a608e96b25a09e25 (diff) | |
| parent | 130aa90d5500f481c181a16012724b5f81d62616 (diff) | |
Merge pull request #224 from yipdw/merge-upstream
Merge upstream (tootsuite/mastodon#5703)
Diffstat (limited to 'app/models/account_moderation_note.rb')
| -rw-r--r-- | app/models/account_moderation_note.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/account_moderation_note.rb b/app/models/account_moderation_note.rb index 06f464850..3ac9b1ac1 100644 --- a/app/models/account_moderation_note.rb +++ b/app/models/account_moderation_note.rb @@ -3,10 +3,10 @@ # # Table name: account_moderation_notes # -# id :bigint not null, primary key +# id :integer not null, primary key # content :text not null -# account_id :bigint not null -# target_account_id :bigint not null +# account_id :integer not null +# target_account_id :integer not null # created_at :datetime not null # updated_at :datetime not null # |