Skip to content

Commit 3bb692f

Browse files
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.ts
2 parents 153a490 + 6d6d163 commit 3bb692f

65 files changed

Lines changed: 2308 additions & 723 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.changeset/add-forward-errors.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/add_black_theme.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/add_location_command.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/add_quickreply_keybinds.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/cap_unread_badges.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/feat-room-abbreviations.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/fix-pmp-encrypted.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/fix-pmp-sending-message-with-attachments.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/fix-sliding-sync-known-issues-link.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

.changeset/fix-sw-media-auth-401.md

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)