mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-24 09:04:00 -05:00
67ca8bb56a
Conflicts: - `app/javascript/packs/admin.jsx`: Change applied to `app/javascript/core/admin.js` instead. |
||
---|---|---|
.. | ||
__mocks__ | ||
core | ||
flavours | ||
fonts | ||
hooks | ||
icons | ||
images | ||
mastodon | ||
material-icons | ||
packs | ||
skins | ||
styles | ||
svg-icons | ||
types |