mastodon/app/javascript
Claire 6530f9709c Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main
Conflicts:
- `.rubocop_todo.yml`:
  Upstream regenerated this file, glitch-soc had a specific ignore.
2023-08-13 18:47:15 +02:00
..
core Fix interaction modal being broken because of glitch-soc's theming system 2023-07-30 16:45:50 +02:00
flavours [Glitch] Add client-side timeout on resend confirmation button 2023-08-12 09:38:57 +02:00
fonts
hooks
icons
images Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream 2023-06-25 14:27:38 +02:00
mastodon Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main 2023-08-13 18:47:15 +02:00
packs Merge commit '3a4d3e9d4b573c400eec1743471d54cdccae50a5' into glitch-soc/merge-upstream 2023-08-12 09:36:38 +02:00
skins
styles Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main 2023-08-13 18:47:15 +02:00
types Change interaction modal in web UI (#26075) 2023-07-27 16:11:17 +02:00