diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-11-17 17:40:00 -0600 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2017-11-17 17:40:00 -0600 |
| commit | 1ab12ba38ebd42be93b63b7cf0d3c6a81060b741 (patch) | |
| tree | 3899389c63c16e33dd48fadb270d3259a7c15b67 /app/models/custom_emoji.rb | |
| parent | 6f8ccbfcdf7fd8ca651d1583a608e96b25a09e25 (diff) | |
| parent | 24cafd73a2b644025e9aeaadf4fed46dd3ecea4d (diff) | |
Merge remote-tracking branch 'origin/master' into merge-upstream
Diffstat (limited to 'app/models/custom_emoji.rb')
| -rw-r--r-- | app/models/custom_emoji.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/custom_emoji.rb b/app/models/custom_emoji.rb index 5723ebd5d..a77b53c98 100644 --- a/app/models/custom_emoji.rb +++ b/app/models/custom_emoji.rb @@ -3,7 +3,7 @@ # # Table name: custom_emojis # -# id :bigint not null, primary key +# id :integer not null, primary key # shortcode :string default(""), not null # domain :string # image_file_name :string |