mirror of
https://github.com/element-hq/element-web.git
synced 2024-12-16 01:41:30 +03:00
4c42313f99
Conflicts: src/components/views/settings/tabs/room/SecurityRoomSettingsTab.tsx src/createRoom.ts |
||
---|---|---|
.. | ||
account | ||
discovery | ||
tabs | ||
AvatarSetting.js | ||
BridgeTile.tsx | ||
ChangeAvatar.js | ||
ChangeDisplayName.js | ||
ChangePassword.js | ||
CrossSigningPanel.js | ||
DevicesPanel.js | ||
DevicesPanelEntry.js | ||
E2eAdvancedPanel.tsx | ||
EventIndexPanel.tsx | ||
IntegrationManager.js | ||
Notifications.js | ||
ProfileSettings.js | ||
SecureBackupPanel.js | ||
SetIdServer.tsx | ||
SetIntegrationManager.js | ||
SpellCheckSettings.tsx | ||
UpdateCheckButton.tsx |