mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-02-07 23:42:11 -05:00
Conflicts: - `app/javascript/packs/admin.tsx`: Changes applied to `app/javascript/core/admin.ts` instead.
Conflicts: - `app/javascript/packs/admin.tsx`: Changes applied to `app/javascript/core/admin.ts` instead.