Commit 3bb692f
committed
Merge branch 'dev' of github.com:SableClient/Sable into hazre/feat/arborium-migration
# Conflicts:
# src/app/plugins/react-custom-html-parser.test.tsx
# src/app/plugins/react-custom-html-parser.tsx
# src/app/utils/sanitize.test.ts
# src/app/utils/sanitize.ts65 files changed
Lines changed: 2308 additions & 723 deletions
File tree
- .changeset
- .github/workflows
- src
- app
- components
- message
- modals
- room-avatar
- url-preview
- user-avatar
- features
- room
- message
- settings
- Persona
- account
- keyboard-shortcuts
- hooks
- timeline
- plugins
- pluralkit-handler
- state
- utils
- client
- types/matrix
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
This file was deleted.
0 commit comments