Claire a2e7997592 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Our README is completely different. Discarded upstream changes.		2022-11-28 11:33:34 +01:00
..
core
flavours	Fix pillbar buttons in light theme (#1972)	2022-11-25 13:54:43 +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-11-28 11:33:34 +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-11-28 11:33:34 +01:00