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/conversation.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/conversation.rb')
| -rw-r--r-- | app/models/conversation.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/conversation.rb b/app/models/conversation.rb index e08532522..08c1ce945 100644 --- a/app/models/conversation.rb +++ b/app/models/conversation.rb @@ -3,7 +3,7 @@ # # Table name: conversations # -# id :bigint not null, primary key +# id :integer not null, primary key # uri :string # created_at :datetime not null # updated_at :datetime not null |