mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-25 01:24:02 -05:00
1ad91dece8
Conflicts: - `app/javascript/packs/admin.jsx`: Changes applied to `app/javascript/core/admin.js` instead. |
||
---|---|---|
.. | ||
admin.js | ||
auth.js | ||
common.js | ||
embed.js | ||
inert.js | ||
mailer.js | ||
remote_interaction_helper.ts | ||
settings.js | ||
theme.yml | ||
two_factor_authentication.js |