Jeremy Kescher 198d0b2ed4 Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # Gemfile.lock		2023-04-04 15:26:23 +02:00
..
core	[Glitch] Run eslint --fix	2023-02-03 20:52:07 +01:00
flavours	Merge remote-tracking branch 'upstream/main' into develop	2023-04-04 15:26:23 +02:00
fonts	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
hooks	[Proposal] Make able to write React in Typescript (#16210)	2023-04-03 03:31:39 +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	Merge remote-tracking branch 'upstream/main' into develop	2023-04-04 15:26:23 +02:00
packs	Move ESLint configs to overrides (#24370)	2023-04-03 12:41:10 +02:00
skins	Merge remote-tracking branch 'upstream/main' into develop	2022-12-09 14:47:08 +01:00
styles	Merge remote-tracking branch 'upstream/main' into develop	2023-04-04 15:26:23 +02:00
types	New Crowdin updates (#24276)	2023-04-03 14:44:43 +02:00