You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		10 months ago
..
_error_messages.html.haml	Remove unused `#error_explanation` id from error partials (#27536)	1 year ago
_og.html.haml	Use a helper to avoid using `media/` asset prefixes (#28756)	10 months ago
_web_app.html.haml	Remove redundant asset preload (#2488)	12 months ago