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
..
contrast	Fix translate button position (#25807)	2023-07-08 00:12:31 +02:00
fonts	Merge commit '7f471e70c0e1cc106747634d20f173a68a9272d7' into glitch-soc/merge-upstream	2024-01-15 21:30:00 +01:00
mastodon	Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream	2024-01-17 18:32:15 +01:00
mastodon-light	Fix destructive actions in dropdowns not using error color in light theme (#28484)	2023-12-29 11:32:40 +00:00
application.scss	Change icons in web UI (#27385)	2023-10-24 17:45:08 +00:00
contrast.scss	…
inert.scss	Use the assets pipeline to load `inert.css` (#28701)	2024-01-12 09:32:45 +00:00
mailer.scss	Update follow and follow_request emails (#28755)	2024-01-17 14:37:04 +00:00
mastodon-light.scss	…
win95.scss	Update win95 style from cybre.space	2022-04-27 23:05:24 +02:00