Holly 6dcb18ea80 fix merge conflict due to "toot" in locale		2023-02-19 19:31:59 +00:00
..
core	[Glitch] Run eslint --fix	2023-02-03 20:52:07 +01:00
flavours	fix merge conflict due to "toot" in locale	2023-02-19 19:31:59 +00:00
fonts	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
icons	png optimization(loss less) (#19630)	2022-11-01 15:06:52 +01:00
images	Merge branch 'main' into glitch-soc/merge-upstream	2022-12-15 20:25:25 +01:00
locales	Merge branch 'master' into glitch-soc/merge-upstream	2018-12-01 21:00:16 +01:00
mastodon	fix merge conflict due to "toot" in locale	2023-02-19 19:31:59 +00:00
packs	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-03 19:23:27 +01:00
skins	initial translation of Glitch-specific texts into Czech (#1997)	2022-12-08 10:38:52 +01:00
styles	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-13 19:35:35 +01:00