mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-28 20:33:41 +01:00
fbfc4145fd
Conflicts: - `app/javascript/packs/public.jsx`: Upstream updated code that we actually moved to `app/javascript/core/settings.js`. Applied the changes there. |
||
---|---|---|
.. | ||
admin.js | ||
auth.js | ||
common.js | ||
embed.js | ||
mailer.js | ||
public.js | ||
remote_interaction_helper.ts | ||
settings.js | ||
theme.yml | ||
two_factor_authentication.js |