Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
Weblate 2017-10-24 15:41:57 +00:00
commit b2d5f4ce80

View file

@ -72,6 +72,13 @@ class RoomViewStore extends Store {
case 'view_room': case 'view_room':
this._viewRoom(payload); this._viewRoom(payload);
break; break;
case 'view_my_groups':
case 'view_group':
this._setState({
roomId: null,
roomAlias: null,
});
break;
case 'view_room_error': case 'view_room_error':
this._viewRoomError(payload); this._viewRoomError(payload);
break; break;