diff options
| author | Reverite <github@reverite.sh> | 2019-08-13 15:45:40 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-08-13 15:45:40 -0700 |
| commit | 2e221bd5b6472d1eecb654b3518af7886d3dadaf (patch) | |
| tree | afb9e3a86ba3a93b6b5f04cdec6070351992fed4 /app/models/user.rb | |
| parent | 9528d3eda280ffac20a18c6f21bfc51f594e2c86 (diff) | |
| parent | b859eb001717dfc62aebb8eba47b84c75aebe4ef (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 45a4b8989..341227d3e 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -108,7 +108,7 @@ class User < ApplicationRecord :reduce_motion, :system_font_ui, :noindex, :flavour, :skin, :display_media, :hide_network, :hide_followers_count, :expand_spoilers, :default_language, :aggregate_reblogs, :show_application, :advanced_layout, :use_blurhash, :use_pending_items, :trends, - :default_content_type, + :default_content_type, :system_emoji_font, to: :settings, prefix: :setting, allow_nil: false attr_reader :invite_code |