mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-24 08:08:07 +01:00
15929a3d59
Conflicts: - `README.md`: Our README is completely different. Discarded upstream changes. - `app/javascript/packs/mailer.js`: We had removed the file. Move the changes to `app/javascript/core/mailer.js`. |
||
---|---|---|
.. | ||
admin.js | ||
auth.js | ||
common.js | ||
embed.js | ||
mailer.js | ||
public.js | ||
settings.js | ||
theme.yml | ||
two_factor_authentication.js |