ab2f0daa10
Conflicts: - `.github/workflows/build-security.yml`: Changes were already cherry-picked and adapted in glitch-soc. Kept glitch-soc's version. - `Gemfile.lock`: Changes were already cherry-picked and updated further in glitch-soc. Kept glitch-soc's version. - `lib/mastodon/version.rb`: Changes were already cherry-picked and updated further in glitch-soc. Kept glitch-soc's version. |
||
---|---|---|
.. | ||
__mocks__ | ||
core | ||
flavours | ||
fonts | ||
hooks | ||
icons | ||
images | ||
mastodon | ||
material-icons | ||
packs | ||
skins | ||
styles | ||
svg-icons | ||
types |