Michael Telatynski 1bc9d344ae Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/nvl/rich_quoting ... Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> # Conflicts: # src/components/views/messages/TextualBody.js		2018-01-10 11:54:58 +00:00
..
controllers	Ignore the default value when calculating if notifications are enabled	2017-12-25 13:29:30 -07:00
handlers	Treat null/undefined notification settings as "not set"	2017-11-15 22:08:13 -07:00
Settings.js	s/Quote/Reply/ and ES6 tweaks	2017-12-17 20:20:45 +00:00
SettingsStore.js	Ignore the default value when calculating if notifications are enabled	2017-12-25 13:29:30 -07:00