Michael Telatynski dd7479accb Merge branch 'develop' of github.com:element-hq/matrix-react-sdk into t3chguy/wat/230.1 ... # Conflicts: # src/components/views/settings/CryptographyPanel.tsx # test/components/views/settings/tabs/user/__snapshots__/SecurityUserSettingsTab-test.tsx.snap		2024-09-25 17:02:32 +01:00
..
AccountUserSettingsTab-test.tsx.snap	…
AppearanceUserSettingsTab-test.tsx.snap	…
KeyboardUserSettingsTab-test.tsx.snap	…
LabsUserSettingsTab-test.tsx.snap	…
MjolnirUserSettingsTab-test.tsx.snap	…
PreferencesUserSettingsTab-test.tsx.snap	…
SecurityUserSettingsTab-test.tsx.snap	Merge branch 'develop' of github.com:element-hq/matrix-react-sdk into t3chguy/wat/230.1	2024-09-25 17:02:32 +01:00
SessionManagerTab-test.tsx.snap	…
SidebarUserSettingsTab-test.tsx.snap	…