[WITH CONFLICTS] Merge branch 'develop' into travis/room-list/enable
This commit is contained in:
commit
bf0a503e44
12 changed files with 313 additions and 117 deletions
|
@ -256,7 +256,7 @@ export default class RoomTile2 extends React.Component<IProps, IState> {
|
|||
0
|
||||
));
|
||||
} else {
|
||||
console.log(`Unexpected tag ${tagId} applied to ${this.props.room.room_id}`);
|
||||
console.warn(`Unexpected tag ${tagId} applied to ${this.props.room.room_id}`);
|
||||
}
|
||||
|
||||
if ((ev as React.KeyboardEvent).key === Key.ENTER) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue