Claire 7452a95998 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: Upstream made changes while we have dropped this file. Keep the file deleted. - `.prettierignore`: Upstream made changes at the end of the file, where we had our extra lines. Just moved our extra lines back at the end. - `app/serializers/initial_state_serializer.rb`: Upstream code style changes. Applied them. - `app/services/backup_service.rb`: Upstream code style changes. Applied them.		2023-02-19 10:42:55 +01:00
..
core	[Glitch] Run eslint --fix	2023-02-03 20:52:07 +01:00
flavours	Merge pull request #2112 from ClearlyClaire/glitch-soc/merge-upstream	2023-02-18 22:05:11 +01: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	…
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	2023-02-19 10:42:55 +01: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