mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-12-01 04:20:13 -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`. |
||
---|---|---|
.. | ||
admin.js | ||
auth.js | ||
common.js | ||
embed.js | ||
inert.js | ||
mailer.js | ||
remote_interaction_helper.ts | ||
settings.js | ||
theme.yml | ||
two_factor_authentication.js |