Claire fc500a6062 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `CONTRIBUTING.md`: Upstream file has changed and we're quoting it. Ported the changes. - `README.md`: Upstream file has changed but we have a completely different one. Kept our version. - `lib/mastodon/version.rb`: Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`, but we're still `glitch-soc/mastodon`. Kept our version. - `spec/presenters/instance_presenter_spec.rb`: Upstream has changed from `tootsuite/mastodon` to `mastodon/mastodon`, but we're still `glitch-soc/mastodon`. Kept our version.		2021-07-13 17:57:15 +02:00
..
migrate	Merge branch 'main' into glitch-soc/merge-upstream	2021-07-13 17:57:15 +02:00
post_migrate	Merge branch 'main' into glitch-soc/merge-upstream	2021-06-03 20:47:02 +02:00
views	Improve performance of follow recommendation scheduler (#16159)	2021-05-05 22:04:52 +02:00
schema.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-07-08 16:17:19 +02:00
seeds.rb	Change unconfirmed user login behaviour (#11375)	2019-07-22 10:48:50 +02:00