mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2025-11-17 13:34:16 +00:00
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 | ||