nurjinn jafar 1123545cfa Merge branch 'develop' of https://github.com/nordeck/matrix-react-sdk into feature_confetti#14676 ...

 Conflicts:

	src/SlashCommands.tsx

	src/i18n/strings/de_DE.json

2020-08-25 11:52:48 +02:00

..

controllers

Decouple Audible notifications from Desktop notifications

2020-08-05 11:10:12 +01: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 https://github.com/nordeck/matrix-react-sdk into feature_confetti#14676

2020-08-25 11:52:48 +02:00

SettingsStore.ts

Implement force state for features like in the proposal

2020-08-17 13:51:41 -06:00

WatchManager.ts

Appease the linter

2020-07-28 16:37:09 -06:00