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/controllers/settings | |
| parent | 9528d3eda280ffac20a18c6f21bfc51f594e2c86 (diff) | |
| parent | b859eb001717dfc62aebb8eba47b84c75aebe4ef (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/controllers/settings')
| -rw-r--r-- | app/controllers/settings/preferences_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb index 418ea5d7a..f05dbe0ea 100644 --- a/app/controllers/settings/preferences_controller.rb +++ b/app/controllers/settings/preferences_controller.rb @@ -49,6 +49,7 @@ class Settings::PreferencesController < Settings::BaseController :setting_expand_spoilers, :setting_reduce_motion, :setting_system_font_ui, + :setting_system_emoji_font, :setting_noindex, :setting_hide_network, :setting_hide_followers_count, |