Travis Ralston 177d9f245a Merge pull request #2441 from matrix-org/develop ...

Merge develop -> experimental

2019-01-14 14:45:20 -07:00

..

controllers

eslint --fix src/

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

handlers

hardcode to to dharma to avoid weird mix

2018-10-22 16:33:46 +02:00

Settings.js

Merge pull request #2441 from matrix-org/develop

2019-01-14 14:45:20 -07:00

SettingsStore.js

eslint --fix src/

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