fbfc4145fd
Conflicts: - `app/javascript/packs/public.jsx`: Upstream updated code that we actually moved to `app/javascript/core/settings.js`. Applied the changes there. |
||
---|---|---|
.. | ||
core | ||
flavours | ||
fonts | ||
hooks | ||
icons | ||
images | ||
mastodon | ||
packs | ||
skins | ||
styles | ||
types |