diff options
author | David Yip <yipdw@member.fsf.org> | 2017-10-16 09:23:59 -0500 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2017-10-16 09:23:59 -0500 |
commit | dbb1fce94dbd877d795898933ca344359f9b74c1 (patch) | |
tree | 06ab5f2ae7714b41aa9e5cc19ac8c234e0f394be /app/controllers | |
parent | 6cd5b3bbe5a11fcf25bbefba2803f2ae840f39fc (diff) | |
parent | aec70b44fc551db6471c8bc5210688b154ac661f (diff) |
Merge remote-tracking branch 'upstream/master' into gs-master
Diffstat (limited to 'app/controllers')
-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 207c7b324..069026715 100644 --- a/app/controllers/settings/preferences_controller.rb +++ b/app/controllers/settings/preferences_controller.rb @@ -39,6 +39,7 @@ class Settings::PreferencesController < ApplicationController :setting_boost_modal, :setting_delete_modal, :setting_auto_play_gif, + :setting_reduce_motion, :setting_system_font_ui, :setting_noindex, :setting_theme, |