Merge branch 'experimental' into bwindels/roomdirectory-makeover

This commit is contained in:
Bruno Windels 2019-01-29 18:33:03 +01:00
commit 855dbd7d2b
29 changed files with 784 additions and 306 deletions

View file

@ -1059,6 +1059,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();