Merge tag 'v3.3.0' into instance_only_statuses

2020-12-27 11:00:43 +01:00
parent 92c4d909a0 633d175146
commit cb085b4c44
877 changed files with 35407 additions and 11128 deletions
--- a/app/views/settings/preferences/appearance/show.html.haml
+++ b/app/views/settings/preferences/appearance/show.html.haml
@ -30,6 +30,7 @@
  .fields-group
    = f.input :setting_auto_play_gif, as: :boolean, wrapper: :with_label, recommended: true
    = f.input :setting_reduce_motion, as: :boolean, wrapper: :with_label
+    = f.input :setting_disable_swiping, as: :boolean, wrapper: :with_label
    = f.input :setting_system_font_ui, as: :boolean, wrapper: :with_label

  %h4= t 'appearance.toot_layout'