mastodon/app/javascript
Claire 4b0fb764c3 Merge commit 'e93a75f1a11d6dfdcbd39dbdc22526c5508ad881' into glitch-soc/merge-upstream
Conflicts and ported changes:
- updated `@rails/ujs` imports
2023-10-24 19:59:19 +02:00
..
core Merge commit 'e93a75f1a11d6dfdcbd39dbdc22526c5508ad881' into glitch-soc/merge-upstream 2023-10-24 19:59:19 +02:00
flavours Merge commit 'e93a75f1a11d6dfdcbd39dbdc22526c5508ad881' into glitch-soc/merge-upstream 2023-10-24 19:59:19 +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 'd9503a1965a16328b62ea7bf0bb54e87cbe30d29' into glitch-soc/merge-upstream 2023-10-24 19:21:01 +02:00
packs Merge commit 'e93a75f1a11d6dfdcbd39dbdc22526c5508ad881' into glitch-soc/merge-upstream 2023-10-24 19:59:19 +02:00
skins
styles Merge commit '126cd7705dbeca5712da941a72661e26c189658b' into glitch-soc/merge-upstream 2023-10-19 20:48:22 +02:00
types Change interaction modal in web UI (#26075) 2023-07-27 16:11:17 +02:00