Claire 4ef66d6538 Merge commit '15182d1e5e595b21c47b48c5d258f30a0251e753' into glitch-soc/merge-upstream ... Conflicts: - `.rubocop_todo.yml`: glitch-soc had extra ignores. Removed them.		2023-10-24 20:31:20 +02:00
..
core	Fix `@rails/ujs` imports	2023-10-24 20:23:31 +02:00
flavours	Fix `@rails/ujs` imports	2023-10-24 20:23:31 +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 '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream	2023-06-25 14:27:38 +02:00
mastodon	Merge commit '15182d1e5e595b21c47b48c5d258f30a0251e753' into glitch-soc/merge-upstream	2023-10-24 20:31:20 +02:00
packs	Merge commit 'e93a75f1a11d6dfdcbd39dbdc22526c5508ad881' into glitch-soc/merge-upstream	2023-10-24 19:59:19 +02:00
skins	initial translation of Glitch-specific texts into Czech (#1997)	2022-12-08 10:38:52 +01:00
styles	Merge commit '126cd7705dbeca5712da941a72661e26c189658b' into glitch-soc/merge-upstream	2023-10-19 20:48:22 +02:00
types	Change interaction modal in web UI (#26075)	2023-07-27 16:11:17 +02:00