Claire 33024cca51 Merge commit '13a4a81f022a1b944dd65acb1041dc76093b0901' into glitch-soc/main ... Conflicts: - `.rubocop_todo.yml`: Upstream regenerated this file, glitch-soc had a specific ignore.		2023-08-13 18:47:15 +02:00
..
core	Fix interaction modal being broken because of glitch-soc's theming system	2023-07-30 16:45:50 +02:00
flavours	[Glitch] Add client-side timeout on resend confirmation button	2023-08-12 09:38:57 +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 commit '3d50947e62272e3da4365e0b751e4e45c1d9bac6' into glitch-soc/merge-upstream	2023-06-25 14:27:38 +02:00
mastodon	Merge commit '13a4a81f022a1b944dd65acb1041dc76093b0901' into glitch-soc/main	2023-08-13 18:47:15 +02:00
packs	Merge commit '788d7a6a2a4582601dd741ad880ef7b775335d14' into glitch-soc/merge-upstream	2023-08-12 09:36:38 +02:00
skins	initial translation of Glitch-specific texts into Czech (#1997)	2022-12-08 10:38:52 +01:00
styles	Merge commit '13a4a81f022a1b944dd65acb1041dc76093b0901' into glitch-soc/main	2023-08-13 18:47:15 +02:00
types	Change interaction modal in web UI (#26075)	2023-07-27 16:11:17 +02:00