mastodon/app/javascript
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
..
__mocks__ Change icon SVG imports to use a default import (#28709) 2024-01-12 10:31:24 +00:00
core Remove bypass and use use glitch-soc's theming system for inert.css 2024-01-15 22:16:26 +01:00
flavours [Glitch] Update devDependencies (non-major) 2024-01-17 18:12:00 +01:00
fonts Merge commit '7f471e70c0e1cc106747634d20f173a68a9272d7' into glitch-soc/merge-upstream 2024-01-15 21:30:00 +01:00
hooks [Proposal] Make able to write React in Typescript (#16210) 2023-04-03 03:31:39 +02:00
icons png optimization(loss less) (#19630) 2022-11-01 15:06:52 +01:00
images 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
material-icons [Glitch] Switch from 48px weight 600 material symbol icons to 24px weight 400 icons 2024-01-15 20:53:08 +01:00
packs Remove bypass and use use glitch-soc's theming system for inert.css 2024-01-15 22:16:26 +01:00
skins initial translation of Glitch-specific texts into Czech (#1997) 2022-12-08 10:38:52 +01:00
styles Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream 2024-01-17 18:32:15 +01:00
svg-icons Add icons for private and disabled boost in web UI (#27817) 2023-11-13 14:39:45 +00:00
types Change icon SVG imports to use a default import (#28709) 2024-01-12 10:31:24 +00:00