diff options
| author | Fire Demon <firedemon@creature.cafe> | 2020-10-22 17:34:29 -0500 |
|---|---|---|
| committer | Fire Demon <firedemon@creature.cafe> | 2020-10-22 17:34:29 -0500 |
| commit | adf60e63806a4b8f843ce6722a9086044f0bb5cd (patch) | |
| tree | 722969bdb867727a65aeb78bfdab4fa5f60248a5 /app/controllers/settings/preferences_controller.rb | |
| parent | c36dd229f9dcb1d77c46d8db23297fc5781b4a97 (diff) | |
| parent | 36e5c9d45be0e94216b5b92ea8749a00bb68e0e3 (diff) | |
Merge remote-tracking branch 'upstream/master' into merge-glitch
Diffstat (limited to 'app/controllers/settings/preferences_controller.rb')
| -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 0a7c53f83..3d6696fc4 100644 --- a/app/controllers/settings/preferences_controller.rb +++ b/app/controllers/settings/preferences_controller.rb @@ -48,6 +48,7 @@ class Settings::PreferencesController < Settings::BaseController :setting_display_media, :setting_expand_spoilers, :setting_reduce_motion, + :setting_disable_swiping, :setting_system_font_ui, :setting_system_emoji_font, :setting_noindex, |