Merge branch 'develop' into matthew/notif-panel
This commit is contained in:
commit
c597f05e71
12 changed files with 64 additions and 8 deletions
|
@ -109,7 +109,7 @@ var LeftPanel = React.createClass({
|
|||
var CallView = sdk.getComponent('voip.CallView');
|
||||
callPreview = (
|
||||
<CallView
|
||||
className="mx_LeftPanel_callView" onClick={this.onCallViewClick}
|
||||
className="mx_LeftPanel_callView" showVoice={true} onClick={this.onCallViewClick}
|
||||
ConferenceHandler={VectorConferenceHandler} />
|
||||
);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue