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
..
_account.html.haml	Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream	2024-01-17 18:32:15 +01:00
_button.html.haml	Update new email templates (#28416)	2024-01-15 18:18:59 +00:00
_checklist.html.haml	Use a helper to avoid using media/ asset prefixes (#28756)	2024-01-17 12:19:51 +00:00
_frame.html.haml	Update new email templates (#28416)	2024-01-15 18:18:59 +00:00
_heading.html.haml	Update new email templates (#28416)	2024-01-15 18:18:59 +00:00