mirror of
https://github.com/funamitech/mastodon
synced 2024-12-13 14:18:34 +09:00
6ee3e382df
Conflicts: - `app/javascript/packs/public.jsx`: Some of the removed dead code was split from this code in `app/javascript/core/public.js` and `app/javascript/core/settings.js`. Removed this dead code, and removed `app/javascript/core/public.js` altogether. |
||
---|---|---|
.. | ||
admin.js | ||
auth.js | ||
common.js | ||
embed.js | ||
mailer.js | ||
remote_interaction_helper.ts | ||
settings.js | ||
theme.yml | ||
two_factor_authentication.js |