Glitch-Shrike/app/javascript
Claire 65ca37bbaa Merge commit 'a32a126cac42c73236236b5a9bd660765b9c58ee' into glitch-soc/merge-upstream
Conflicts:
- `spec/lib/sanitize/config_spec.rb`:
  Conflict due to glitch-soc having factored the file differently.
  Ported upstream's changes.
2024-03-13 20:14:18 +01:00
..
__mocks__
core Merge commit '3389c41b5899c1da479bfc08e84588184e09902d' into glitch-soc/merge-upstream 2024-03-01 13:02:59 +01:00
flavours [Glitch] Fix navigation panel icons missing classes 2024-03-13 20:13:35 +01:00
fonts
hooks
icons
images Update flavor screenshots (#2664) 2024-03-07 12:59:00 +01:00
mastodon Merge commit 'a32a126cac42c73236236b5a9bd660765b9c58ee' into glitch-soc/merge-upstream 2024-03-13 20:14:18 +01:00
material-icons Merge commit '24319836de6046fb2985ec1a24c30ad7d47584d7' into glitch-soc/merge-upstream 2024-03-11 17:29:07 +01:00
packs Fix regression in handling `select` elements in `packs/admin.tsx` (#29469) 2024-03-01 10:16:35 +00:00
skins
styles Merge commit 'acf3f410aef3cfb9e8f5f73042526de9b2f96d13' into glitch-soc/merge-upstream 2024-03-13 20:13:29 +01:00
svg-icons
types