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

Claire 525919c04f Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/locales/ja.json`: Upstream change too close to a glitch-soc-specific string. The glitch-soc-specific string should not have been in this file, so it has been moved to `app/javascript/flavours/glitch/locales/ja.js`. - `app/javascript/packs/public.js`: Upstream refactored a part, that as usual is split and duplicated in various pack files. Updated those pack files accordingly. - `app/views/layouts/application.html.haml`: Upstream fixed custom.css path in a different way than we did, went with upstream's change.		2 years ago
..
chewy	Change algorithm of `tootctl search deploy` to improve performance (#18463)	3 years ago
controllers	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
helpers	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
javascript	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
lib	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
mailers	Add support for language preferences for trending statuses and links (#18288)	2 years ago
models	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
policies	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
presenters	Fix remote account in contact account setting not being used (#19351)	2 years ago
serializers	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
services	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
validators	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
views	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
workers	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago