Travis Ralston 9cdb527163 Merge branch 'develop' into travis/pinned-room-list		2018-10-25 10:57:08 -06:00
..
controllers	Avoid clearing e2e encryption keys, also avoid warning	2018-08-13 17:24:27 +02:00
handlers	fix event type which room-account settings were read from	2018-06-22 19:17:31 +01:00
Settings.js	Merge branch 'develop' into travis/pinned-room-list	2018-10-25 10:57:08 -06:00
SettingsStore.js	explain exception	2018-08-13 16:53:16 +02:00