diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-02-08 23:17:14 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-02-08 23:17:14 +0000 |
| commit | 5ba2c300d8ab0e3adc58a380162b66abafbb3bb8 (patch) | |
| tree | a3bb67479db79ca9777cf2d6c1b767ad0f0f53d2 /app/models/web/setting.rb | |
| parent | 3405ea6dd9fde38ba1044933fec2ec7fa909ea8c (diff) | |
| parent | 1167c6dbf8d5b8411d9924350b2b9735da6d9d26 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/models/web/setting.rb')
| -rw-r--r-- | app/models/web/setting.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/web/setting.rb b/app/models/web/setting.rb index 12b9d1226..0a5129d17 100644 --- a/app/models/web/setting.rb +++ b/app/models/web/setting.rb @@ -7,7 +7,7 @@ # data :json # created_at :datetime not null # updated_at :datetime not null -# user_id :integer +# user_id :integer not null # class Web::Setting < ApplicationRecord |