Michael Telatynski bec1d718e0 Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets ... Conflicts: src/components/views/elements/AppTile.js src/utils/WidgetUtils.ts		2020-10-19 20:50:16 +01:00
..
controllers	Appease the linter	2020-09-18 11:39:41 -06:00
handlers	Implement new config style for features	2020-08-17 13:24:55 -06:00
watchers	Replace Riot with Element in docs and comments	2020-08-03 18:33:36 +01:00
SettingLevel.ts	Move SettingLevel to its own file	2020-07-28 11:37:59 -06:00
Settings.ts	Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/feat/room-list-widgets	2020-10-19 20:50:16 +01:00
SettingsStore.ts	Update src/settings/SettingsStore.ts	2020-09-18 19:14:24 +01:00
UIFeature.ts	Add a UI feature to disable advanced encryption options	2020-09-18 11:33:02 -06:00
WatchManager.ts	Make Travis an ounce happier	2020-09-08 15:07:16 +01:00