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

..

AliasSettings.js

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

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

ColorSettings.js

Convert CommonJS exports to ES6-compatible exports

2019-12-22 21:01:02 -07:00

RelatedGroupSettings.js

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

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

RoomProfileSettings.js

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

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

UrlPreviewSettings.js

Merge pull request #3761 from matrix-org/travis/babel7-wp-es6-export

2020-01-08 09:09:11 -07:00