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

2018-11-20 18:08:39 +00:00

..

controllers

eslint --fix src/

2018-10-26 22:50:38 -05: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-11-20 18:08:39 +00:00

SettingsStore.js

eslint --fix src/

2018-10-26 22:50:38 -05:00