2 Commits (84c7b272e1b74290bf85e26d7cf3c620bf3eddf8)

Author	SHA1	Message	Date
Claire	f6654e0842	Merge commit '958a810553aac6b6cf21d9d107a47b6f68b2a401' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/admin.jsx`: This file was split between `app/javascript/core/admin.js`, `app/javascript/pack/admin.jsx`, and `app/javascript/flavours/glitch/packs/admin.jsx`. Ported upstream's change, splitting the new file to `app/javascript/core/admin.ts`, `app/javascript/packs/admin.tsx`, and `app/javascript/flavours/glitch/packs/admin.tsx`	2024-02-29 19:02:31 +01:00
Renaud Chaput	958a810553	Convert `packs/admin.jsx` to Typescript (#29425)	2024-02-29 15:21:03 +00:00