Claire b81710c02c Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `CONTRIBUTING.md`: Not a real conflict, glitch-soc quotes the upstream file, which has been changed. Update the quote.		2021-01-26 14:01:30 +01:00
..
core	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-15 14:27:06 +01:00
flavours	[Glitch] Fix Google Translate breaking web interface	2021-01-21 16:59:47 +01:00
fonts
images
locales
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2021-01-26 14:01:30 +01:00
packs	Add ability to require invite request text (#15326)	2020-12-14 10:03:09 +01:00
skins
styles	Merge branch 'master' into glitch-soc/merge-upstream	2021-01-06 18:08:06 +01:00