Travis Ralston 3e5cc9550b Fix import merge conflicts, removing any that aren't needed anymore ...

Many imports were removed as part of refactoring work, so here we are.

2020-01-09 14:17:33 -07:00

..

FlairUserSettingsTab.js

Fix import merge conflicts, removing any that aren't needed anymore

2020-01-09 14:17:33 -07:00

GeneralUserSettingsTab.js

Fix MatrixClientPeg imports

2019-12-22 21:15:54 -07:00

HelpUserSettingsTab.js

Fix MatrixClientPeg imports

2019-12-22 21:15:54 -07:00

LabsUserSettingsTab.js

Convert imports to ES6 from CommonJS

2019-12-22 21:16:06 -07:00

MjolnirUserSettingsTab.js

Convert imports to ES6 from CommonJS

2019-12-22 21:16:06 -07:00

NotificationUserSettingsTab.js

Convert imports to ES6 from CommonJS

2019-12-22 21:16:06 -07:00

PreferencesUserSettingsTab.js

[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop

2020-01-09 14:15:09 -07:00

SecurityUserSettingsTab.js

[CONFLICT CHUNKS] Merge branch 'develop' into travis/sourcemaps-develop

2020-01-09 14:15:09 -07:00

VoiceUserSettingsTab.js

Convert imports to ES6 from CommonJS

2019-12-22 21:16:06 -07:00