mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-10-21 12:57:34 +02:00
a02244f17c
Conflicts: app/javascript/packs/public.js Changes made to app/javascript/packs/publics.js were applied to app/javascript/core/settings.js |
||
---|---|---|
.. | ||
core | ||
flavours | ||
fonts | ||
images | ||
locales | ||
mastodon | ||
packs | ||
skins | ||
styles |