about summary refs log tree commit diff
path: root/app/models/conversation.rb
diff options
context:
space:
mode:
authorSurinna Curtis <ekiru.0@gmail.com>2017-11-16 01:38:26 -0600
committerGitHub <noreply@github.com>2017-11-16 01:38:26 -0600
commitee560abdbe7a2caf0f7ac6137faf248bbaff9a93 (patch)
treefcd9bdb5ba49ab7a6a79590c74db858ae77b4239 /app/models/conversation.rb
parent88627fd7aa2493a6890d60a5965459e4c7fe6fe9 (diff)
parent35fbdc36f92b610e8a73e2acb220e87cf5fc83b0 (diff)
Merge pull request #216 from glitch-soc/merge-upstream-3023725
Merge upstream at commit 3023725
Diffstat (limited to 'app/models/conversation.rb')
-rw-r--r--app/models/conversation.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/conversation.rb b/app/models/conversation.rb
index 08c1ce945..e08532522 100644
--- a/app/models/conversation.rb
+++ b/app/models/conversation.rb
@@ -3,7 +3,7 @@
 #
 # Table name: conversations
 #
-#  id         :integer          not null, primary key
+#  id         :bigint           not null, primary key
 #  uri        :string
 #  created_at :datetime         not null
 #  updated_at :datetime         not null