mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-19 14:12:54 -05:00
c2f0ea415e
Conflicts: - `app/javascript/packs/admin.jsx`: Changes split in `app/javascript/core/admin.js` and `app/javascript/flavours/glitch/packs/admin.jsx`.