Claire 8ec4be4233 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Not a real conflict, upstream-updated dependency (redis) textually too close to glitch-soc-only dependecy. Updated redis gem like upstream did.		2021-08-09 23:25:49 +02:00
..
core	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-15 14:27:06 +01:00
flavours	Add missing Korean translations	2021-08-06 20:06:05 +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-08-09 23:25:49 +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-08-09 23:25:49 +02:00