Merge pull request #2680 from alexte/develop

RoomDirectory Dropdown should use roomDirectory.servers
This commit is contained in:
Travis Ralston
2019-02-21 19:01:44 -07:00
committed by GitHub
@@ -131,8 +131,8 @@ export default class NetworkDropdown extends React.Component {
const options = []; const options = [];
let servers = []; let servers = [];
if (this.props.config.servers) { if (this.props.config.roomDirectory.servers) {
servers = servers.concat(this.props.config.servers); servers = servers.concat(this.props.config.roomDirectory.servers);
} }
if (servers.indexOf(MatrixClientPeg.getHomeServerName()) == -1) { if (servers.indexOf(MatrixClientPeg.getHomeServerName()) == -1) {