mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
45deca65b3
Conflicts: - `app/javascript/packs/public.js`: Conflict because part of that file has been split to `app/javascript/core/settings.js`. Ported those changes there. |
||
---|---|---|
.. | ||
admin.js | ||
common.js | ||
embed.js | ||
mailer.js | ||
public.js | ||
settings.js | ||
theme.yml |