Claire c59fb65ddc Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream ... 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.		2024-01-17 18:32:15 +01:00
..
_error_messages.html.haml	Remove unused `#error_explanation` id from error partials (#27536)	2023-10-25 07:12:32 +00:00
_og.html.haml	Use a helper to avoid using `media/` asset prefixes (#28756)	2024-01-17 12:19:51 +00:00
_web_app.html.haml	Remove redundant asset preload (#2488)	2023-12-02 14:54:26 +01:00