Travis Ralston cbee9146a6 Merge branch 'travis/room-list/setting-diff' into travis/room-list/unread-2

2020-06-22 10:57:40 -06:00

..

controllers

clean up and fix the isMasterRuleEnabled logic

2020-06-17 16:31:42 +01:00

handlers

Soften warning about lack of rooms in setting updates

2020-06-22 10:57:08 -06:00

watchers

Lint a few semicolons

2020-06-18 14:32:43 +01:00

Settings.js

Update badge logic for new setting and behaviour

2020-06-22 10:26:19 -06:00

SettingsStore.js

…

WatchManager.js

Trigger room-specific watchers whenever a higher level change happens

2020-06-22 10:28:05 -06:00