Claire c81d1b0d38 Merge commit 'c8181eb0a41c4f5c1655d4e400cab071aee4182a' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/admin.jsx`: Upstream reworked imports, but we had many changes. Reworked imports as upstream did. - `app/javascript/packs/public.jsx`: Upstream reworked imports, but we had many changes. Reworked imports as upstream did.		2023-05-09 22:12:05 +02:00
..
core	Merge commit 'c8181eb0a41c4f5c1655d4e400cab071aee4182a' into glitch-soc/merge-upstream	2023-05-09 22:12:05 +02:00
flavours	[Glitch] Add TypeScript support for `mastodon` alias and image imports	2023-05-09 21:50:48 +02:00
fonts	…
hooks	[Proposal] Make able to write React in Typescript (#16210)	2023-04-03 03:31:39 +02:00
icons	…
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 'c8181eb0a41c4f5c1655d4e400cab071aee4182a' into glitch-soc/merge-upstream	2023-05-09 22:12:05 +02:00
packs	Merge commit 'c8181eb0a41c4f5c1655d4e400cab071aee4182a' into glitch-soc/merge-upstream	2023-05-09 22:12:05 +02:00
skins	…
styles	Merge commit 'f877aa9d70d0d600961989b8e97c0e0ce3ac1db6' into glitch-soc/merge-upstream	2023-05-08 19:28:21 +02:00
types	Enforce stricter rules for Typescript files (#24910)	2023-05-09 03:11:56 +02:00