Claire 9a3d91f629 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/models/concerns/domain_materializable.rb`: Fixed a code style issue upstream in a PR that got merged in glitch-soc earlier. Changed the code to match upstream's.		2022-12-07 09:03:42 +01:00
..
core
flavours	Fix content-type being reset when editing toots (#1993)	2022-12-04 17:58:10 +01:00
fonts
icons
images	Merge branch 'main' into glitch-soc/merge-upstream	2022-11-12 13:28:03 +01:00
locales
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-07 09:03:42 +01:00
packs	Support for import/export of instance-level domain blocks/allows for 4.x w/ additional fixes (#20597)	2022-11-17 11:05:09 +01:00
skins
styles	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-07 09:03:42 +01:00