Thibaut Girka 0437d70628 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/follower_accounts_controller.rb`: Conflict due to upstream changing suspension logic while glitch-soc has an extra option to hide followers count. Ported upstream changes.		2020-11-08 14:20:35 +01:00
..
.gitkeep
20180813113448_copy_status_stats_cleanup.rb
20180813160548_post_migrate_filters.rb
20181116184611_copy_account_stats_cleanup.rb
20190511152737_remove_suspended_silenced_account_fields.rb
20190519130537_remove_boosts_widening_audience.rb
20190706233204_drop_stream_entries.rb
20190715031050_drop_subscriptions.rb
20190901040524_remove_score_from_tags.rb
20190927124642_remove_invalid_web_push_subscription.rb
20200917193528_migrate_notifications_type.rb
20200917222734_remove_index_notifications_on_account_activity.rb
20201017234926_fill_account_suspension_origin.rb	Add support for reversible suspensions through ActivityPub (#14989)	2020-11-08 00:28:39 +01:00