mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2025-01-14 06:14:05 +01:00
65ca37bbaa
Conflicts: - `spec/lib/sanitize/config_spec.rb`: Conflict due to glitch-soc having factored the file differently. Ported upstream's changes. |
||
---|---|---|
.. | ||
__mocks__ | ||
core | ||
flavours | ||
fonts | ||
hooks | ||
icons | ||
images | ||
mastodon | ||
material-icons | ||
packs | ||
skins | ||
styles | ||
svg-icons | ||
types |