Merge tag 'v3.1.1' into instance_only_statuses

2020-02-21 14:21:59 +01:00
parent a42a98bc67 b752666e3f
commit e0f3a4583c
1431 changed files with 34462 additions and 10030 deletions
--- a/app/controllers/settings/preferences_controller.rb
+++ b/app/controllers/settings/preferences_controller.rb
@ -58,6 +58,7 @@ class Settings::PreferencesController < Settings::BaseController
      :setting_use_blurhash,
      :setting_use_pending_items,
      :setting_trends,
+      :setting_crop_images,
      notification_emails: %i(follow follow_request reblog favourite mention digest report pending_account trending_tag),
      interactions: %i(must_be_follower must_be_following must_be_following_dm)
    )