David Baker 7d161de35b Partial merge of develop to experimental ...

Does not include #2336 as the file has been moved out from underneath it:
will do this separately

2019-01-03 15:02:58 +00: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

Partial merge of develop to experimental

2019-01-03 15:02:58 +00:00

SettingsStore.js

eslint --fix src/

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