mastodon/app/javascript
Claire 15f6d2d038 Merge commit 'd27eb181f6ab419d1745a1fe9b94094be17a618f' into glitch-soc/merge-upstream
Conflicts:
- `spec/requests/api/v2/instance_spec.rb`:
  Conflict due to glitch-soc having a different default site name.
  Updated the tests as upstream did, keeping glitch-soc's default name.
2024-05-01 17:22:02 +02:00
..
__mocks__
flavours [Glitch] Use integers and not numbers in notification policy API counters 2024-05-01 17:12:57 +02:00
fonts
hooks
icons
images Merge commit 'ffc5be4820ed7bad4656489f096230dd7965140b' into glitch-soc/merge-upstream 2024-03-19 19:21:12 +01:00
mastodon Merge commit 'c70c39cad03824c64564fa7d241e6bf01acbab76' into glitch-soc/merge-upstream 2024-05-01 17:06:49 +02:00
material-icons Merge commit '119c7aa0df1e1d26bdee1701250d23a7af9e9136' into glitch-soc/merge-upstream 2024-04-06 20:34:07 +02:00
packs Change how theme style packs are loaded 2024-04-28 15:45:41 +02:00
skins Rename `app/javascript/flavours/glitch/styles/index.scss` to `application.scss` 2024-04-30 21:03:04 +02:00
styles Merge commit 'd27eb181f6ab419d1745a1fe9b94094be17a618f' into glitch-soc/merge-upstream 2024-05-01 17:22:02 +02:00
svg-icons Use active variants for boost icons and increase icon size (#27924) 2024-01-24 12:37:43 +00:00
types