Merge branch 'experimental' into bwindels/redesign-smallfixes
This commit is contained in:
commit
15a74cac15
19 changed files with 656 additions and 258 deletions
|
@ -1054,6 +1054,7 @@ export default React.createClass({
|
|||
modal.close();
|
||||
if (this.state.currentRoomId === roomId) {
|
||||
dis.dispatch({action: 'view_next_room'});
|
||||
dis.dispatch({action: 'close_room_settings'});
|
||||
}
|
||||
}, (err) => {
|
||||
modal.close();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue