Claire 7f078e41c0 Merge commit 'd67de22458e599447c0d5c85ecbd6fb5aef9b4f4' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: We deleted it. Kept it removed. - `app/javascript/packs/public.jsx`: Upstream changed an import, we have slightly different ones. Ported upstream changes.		2023-05-09 23:12:48 +02:00
..
core	[Glitch] Dont use CommonJS (require, module.exports) anywhere	2023-05-09 22:28:53 +02:00
flavours	Disable broken onboarding code	2023-05-09 23:03: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	2023-04-29 10:44:56 +02:00
locales	Move locale-data back to app/javascript/mastodon/locales/locale-data (#2169)	2023-04-08 14:11:40 +02:00
mastodon	Merge commit 'd67de22458e599447c0d5c85ecbd6fb5aef9b4f4' into glitch-soc/merge-upstream	2023-05-09 23:12:48 +02:00
packs	Merge commit 'd67de22458e599447c0d5c85ecbd6fb5aef9b4f4' into glitch-soc/merge-upstream	2023-05-09 23:12:48 +02:00
skins	initial translation of Glitch-specific texts into Czech (#1997)	2022-12-08 10:38:52 +01:00
styles	Merge commit '0d919f27beb6e4e7a562a6eed8f354415b5c217e' into glitch-soc/merge-upstream	2023-05-08 19:28:21 +02:00
types	Add more detailed type annotation for Account (#24815)	2023-05-09 12:09:32 +02:00