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

…

20190706233204_drop_stream_entries.rb

…

20190715031050_drop_subscriptions.rb

…

20190901040524_remove_score_from_tags.rb

…

20190927124642_remove_invalid_web_push_subscription.rb

…