This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Claire 85558a5e18 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Minor upstream change, our README is completely different. Kept ours. - `lib/tasks/assets.rake`: glitch-soc has extra code to deal with its theming system, upstream changed a line that exists in glitch-soc. Applied upstream changes.		2023-02-09 12:46:12 +01:00
..
core	…
flavours	…
fonts	…
icons	…
images	…
locales	…
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-09 12:46:12 +01:00
packs	…
skins	…
styles	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-09 12:46:12 +01:00