diff options
author | David Yip <yipdw@member.fsf.org> | 2018-02-10 22:08:45 -0600 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-02-10 22:08:45 -0600 |
commit | b6159bcb0a20f3aabfb4d17ad60842b7aa81925c (patch) | |
tree | 5fbc5ebb3890ddbf0399bc1fd448f109561b2771 /app/controllers/settings | |
parent | 136458eaf4f73abc5bcb5d0b0978aff892e92f27 (diff) | |
parent | b8efc3fc0b961d356472cf2e56fde69a6589ffaa (diff) |
Merge remote-tracking branch 'origin/merge-upstream'
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 7cd1abe0c..c853b5ab7 100644 --- a/app/controllers/settings/preferences_controller.rb +++ b/app/controllers/settings/preferences_controller.rb @@ -36,6 +36,7 @@ class Settings::PreferencesController < Settings::BaseController :setting_favourite_modal, :setting_delete_modal, :setting_auto_play_gif, + :setting_display_sensitive_media, :setting_reduce_motion, :setting_system_font_ui, :setting_noindex, |