Michael Telatynski cd65bdc799 Merge branches 'develop' and 't3chguy/user_online_dot' of github.com:matrix-org/matrix-react-sdk into t3chguy/user_online_dot ...

 Conflicts:

	src/components/views/rooms/RoomBreadcrumbs.js

	src/components/views/rooms/RoomTile.js

2020-04-17 12:58:54 +01:00

..

controllers

Adding the files would help

2020-03-25 18:47:57 +00:00

handlers

Check for null config settings a bit safer

2020-02-12 01:58:21 +00:00

Settings.js

Merge branches 'develop' and 't3chguy/user_online_dot' of github.com:matrix-org/matrix-react-sdk into t3chguy/user_online_dot

2020-04-17 12:58:54 +01:00

SettingsStore.js

Iterate things

2020-02-19 14:52:00 +00:00

WatchManager.js

Use a global WatchManager for settings

2019-02-26 12:52:59 -07:00