Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/fix/15882

This commit is contained in:
Michael Telatynski 2020-12-03 11:42:47 +00:00
commit e4b929c6f9
40 changed files with 1143 additions and 1510 deletions

View file

@ -1971,6 +1971,7 @@ export default class MatrixChat extends React.PureComponent<IProps, IState> {
onLoginClick={this.onLoginClick}
onServerConfigChange={this.onServerConfigChange}
defaultDeviceDisplayName={this.props.defaultDeviceDisplayName}
fragmentAfterLogin={fragmentAfterLogin}
{...this.getServerProperties()}
/>
);