diff options
| author | David Yip <yipdw@member.fsf.org> | 2017-10-16 15:46:12 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-16 15:46:12 -0500 |
| commit | 7c44ad63550ccf3cb7532440f79196b20dc24c5d (patch) | |
| tree | fb5d8ed08dc130607fd7fd31c67b7cad4ebfd8f5 /app/controllers | |
| parent | 6cd5b3bbe5a11fcf25bbefba2803f2ae840f39fc (diff) | |
| parent | 37ff061d9bf0a91da6580960be01e3c6bc5e5c4c (diff) | |
Merge pull request #181 from glitch-soc/upstream-merge-again
Merge upstream, pull in fixes for tootsuite/mastodon#{5409,5417}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, |