Claire 69737b703a Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: our READMEs are entirely different and upstream's has been updated. Kept our README.		2021-05-17 10:30:34 +02:00
..
core
flavours	Fix local-only toggle being buggy when replying to remote toot	2021-05-12 12:38:21 +02:00
fonts
images
locales
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-17 10:30:34 +02:00
packs
skins
styles	Merge branch 'main' into glitch-soc/merge-upstream	2021-05-12 11:03:05 +02:00