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
..
core	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
flavours	Merge remote-tracking branch 'upstream/main' into develop	2 years ago
fonts	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
icons	png optimization(loss less) (#19630)	2 years ago
images	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
locales	…
mastodon	Merge remote-tracking branch 'upstream/main' into develop	2 years ago
packs	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
skins	Add Oatstodon glitch flavour	2 years ago
styles	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago