mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-12-03 19:49:05 +01:00
f01605c665
Conflicts: - `app/javascript/packs/admin.tsx`: Changes applied to `app/javascript/core/admin.ts` instead. |
||
---|---|---|
.. | ||
admin.ts | ||
auth.js | ||
common.js | ||
embed.js | ||
inert.js | ||
mailer.js | ||
remote_interaction_helper.ts | ||
settings.js | ||
theme.yml | ||
two_factor_authentication.js |