Thibaut Girka 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - Gemfile - Gemfile.lock - app/controllers/about_controller.rb - app/controllers/auth/sessions_controller.rb		2019-09-30 12:23:57 +02: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	Revert "Remove conversation URI (#11423)" (#11424)	2019-07-28 17:47:37 +02:00
20190706233204_drop_stream_entries.rb
20190715031050_drop_subscriptions.rb	Remove WebSub subscriptions (#11303)	2019-07-21 04:08:00 +02:00
20190901040524_remove_score_from_tags.rb	Change trending hashtags to not disappear instantly after midnight (#11712)	2019-09-02 18:11:13 +02:00
20190927124642_remove_invalid_web_push_subscription.rb	Validate Web::PushSubscription (#11971)	2019-09-27 15:24:13 +02:00