Michael Telatynski a1908a208e Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/alpha_room_list ... Conflicts: src/components/views/rooms/RoomList.js src/stores/RoomListStore.js		2020-02-26 23:02:06 +00:00
..
FlairUserSettingsTab.js	Fix import merge conflicts, removing any that aren't needed anymore	2020-01-09 14:17:33 -07:00
GeneralUserSettingsTab.js	Replace device with session in UI text	2020-01-29 15:52:32 +00:00
HelpUserSettingsTab.js	delint	2020-02-23 22:19:18 +00:00
LabsUserSettingsTab.js	Use noreferrer in addition to noopener for edge case browsers	2020-02-23 22:14:29 +00:00
MjolnirUserSettingsTab.js	Convert imports to ES6 from CommonJS	2019-12-22 21:16:06 -07:00
NotificationUserSettingsTab.js	Convert imports to ES6 from CommonJS	2019-12-22 21:16:06 -07:00
PreferencesUserSettingsTab.js	Iterate things	2020-02-19 14:52:00 +00:00
SecurityUserSettingsTab.js	Replace device with session in UI text	2020-01-29 15:52:32 +00:00
VoiceUserSettingsTab.js	Convert imports to ES6 from CommonJS	2019-12-22 21:16:06 -07:00