David Baker b59b8b7fca Merge remote-tracking branch 'origin/develop' into dbkr/e2e_backups

2018-10-25 17:42:46 +01: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 remote-tracking branch 'origin/develop' into dbkr/e2e_backups

2018-10-25 17:42:46 +01:00

SettingsStore.js

explain exception

2018-08-13 16:53:16 +02:00