Glitch-Shrike/app/javascript
Claire 83480df820 Merge commit 'b42661ba95b7872ba278fca9b0fee8faffd89e52' into glitch-soc/merge-upstream
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added `<s>` to the list of allowed tags, the conflict is because
  we have a different list of allowed tags.
  Added `<s>` like upstream did.
2024-08-12 17:46:24 +02:00
..
__mocks__
entrypoints Merge commit 'c8b9e60ec123c458efff83eedcfd07f067ef05ae' into glitch-soc/merge-upstream 2024-08-06 17:27:48 +02:00
flavours [Glitch] Fix typos in localisation from #31342 2024-08-11 21:12:24 +02:00
fonts
hooks Change hover cards to not appear until the mouse stops in web UI (#30850) 2024-07-01 15:52:01 +00:00
icons
images
mastodon Merge commit 'b42661ba95b7872ba278fca9b0fee8faffd89e52' into glitch-soc/merge-upstream 2024-08-12 17:46:24 +02:00
material-icons Merge commit 'b42661ba95b7872ba278fca9b0fee8faffd89e52' into glitch-soc/merge-upstream 2024-08-12 17:46:24 +02:00
skins
styles Merge commit 'b42661ba95b7872ba278fca9b0fee8faffd89e52' into glitch-soc/merge-upstream 2024-08-12 17:46:24 +02:00
svg-icons
types