2 Commits (7fe848b161d8d3a3878680d3c1c14532f5ffeb0c)

Author	SHA1	Message	Date
Claire	f01605c665	Merge commit '3389c41b5899c1da479bfc08e84588184e09902d' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/admin.tsx`: Changes applied to `app/javascript/core/admin.ts` instead.	2024-03-01 13:02:59 +01:00
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