You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Jeremy Kescher 03f50f2f00 Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # app/javascript/flavours/glitch/features/ui/components/link_footer.js # lib/mastodon/version.rb # public/avatars/original/missing.png		2 years ago
..
chewy	Revert reverting "Change algorithm of `tootctl search deploy` to improve performance (#18463)".	2 years ago
controllers	Merge remote-tracking branch 'upstream/main' into develop	2 years ago
helpers	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
javascript	Merge remote-tracking branch 'upstream/main' into develop	2 years ago
lib	Merge remote-tracking branch 'upstream/main' into develop	2 years ago
mailers	Add support for language preferences for trending statuses and links (#18288)	2 years ago
models	Merge remote-tracking branch 'upstream/main' into develop	2 years ago
policies	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
presenters	Change sign-in banner to reflect disabled or moved account status (#19773)	2 years ago
serializers	Merge remote-tracking branch 'upstream/main' into develop	2 years ago
services	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
validators	Merge remote-tracking branch 'upstream/main' into develop	2 years ago
views	Merge remote-tracking branch 'upstream/main' into develop	2 years ago
workers	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago