Claire 2bb443c7d5 Port various forgotten fixes from upstream (#1864) ... * [Glitch] Fix crash when failing to load emoji picker Port bd3420b139 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> * [Glitch] Remove duplicate frequently used emojis Port 98146281e1 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com> Co-authored-by: Harmon <Harmon758@gmail.com>		2022-10-12 19:03:28 +02:00
..
core	Merge branch 'main' into glitch-soc/merge-upstream	2022-08-28 11:31:00 +02:00
flavours	Port various forgotten fixes from upstream (#1864)	2022-10-12 19:03:28 +02:00
fonts
icons	Fix wrong aspect ratio of logo in icons (#18639)	2022-06-11 20:32:02 +02:00
images	Merge branch 'main' into glitch-soc/merge-upstream	2022-06-21 08:28:59 +02:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-01 21:00:16 +01:00
mastodon	Add server banner to web app, add GET /api/v2/instance to REST API (#19294)	2022-10-09 19:51:39 +02:00
packs	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-08 15:49:40 +02:00
skins	Glitchsoc translation to 'es' language (#1439)	2020-10-19 22:17:29 +02:00
styles	Add server banner to web app, add GET /api/v2/instance to REST API (#19294)	2022-10-09 19:51:39 +02:00