Claire 1665b84285 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Not really a conflict, just a glitch-soc-only dependency textually too close to an updated upstream one. - `yarn.lock`: Not really a conflict, just a glitch-soc-only dependency textually too close to an updated upstream one.		2021-10-13 15:50:24 +02:00
..
core	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-15 14:27:06 +01:00
flavours	Fix status open hotkey	2021-10-07 23:40:35 +02:00
fonts
images	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-13 22:11:49 +02:00
locales
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2021-10-13 15:50:24 +02:00
packs	Add ability to require invite request text (#15326)	2020-12-14 10:03:09 +01:00
skins	Glitchsoc translation to 'es' language (#1439)	2020-10-19 22:17:29 +02:00
styles	Merge branch 'main' into glitch-soc/merge-upstream	2021-10-06 16:46:32 +02:00