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

..

admin.ts

…

auth.js

…

common.js

…

embed.js

…

inert.js

…

mailer.js

…

remote_interaction_helper.ts

…

settings.js

…

theme.yml

…

two_factor_authentication.js

…