mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-24 17:14:15 -05:00
c59fb65ddc
Conflicts: - `app/helpers/accounts_helper.rb`: Conflict due to glitch-soc's option to hide followers count. Ported upstream changes. Additional changes: - `app/views/application/mailer/_account.html.haml`: Ported glitch-soc's option to hide followers count. - `app/views/settings/flavours/show.html.haml`: Ported the `frontend_asset_url` helper change to glitch-soc. |
||
---|---|---|
.. | ||
__mocks__ | ||
core | ||
flavours | ||
fonts | ||
hooks | ||
icons | ||
images | ||
mastodon | ||
material-icons | ||
packs | ||
skins | ||
styles | ||
svg-icons | ||
types |