mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-28 11:00:26 -05:00
f6654e0842
Conflicts: - `app/javascript/packs/admin.jsx`: This file was split between `app/javascript/core/admin.js`, `app/javascript/pack/admin.jsx`, and `app/javascript/flavours/glitch/packs/admin.jsx`. Ported upstream's change, splitting the new file to `app/javascript/core/admin.ts`, `app/javascript/packs/admin.tsx`, and `app/javascript/flavours/glitch/packs/admin.tsx` |
||
---|---|---|
.. | ||
__mocks__ | ||
core | ||
flavours | ||
fonts | ||
hooks | ||
icons | ||
images | ||
mastodon | ||
material-icons | ||
packs | ||
skins | ||
styles | ||
svg-icons | ||
types |