Merge remote-tracking branch 'upstream/master' into gs-master

2017-10-16 09:23:59 -05:00
parent 6cd5b3bbe5 aec70b44fc
commit dbb1fce94d
67 changed files with 1520 additions and 787 deletions
--- 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,