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

This commit is contained in:
Weblate 2017-11-09 14:17:07 +00:00
commit 3807d99a6a

View file

@ -45,7 +45,7 @@ export default React.createClass({
const label = <EmojiText const label = <EmojiText
element="div" element="div"
title={this.props.group.groupId} title={this.props.group.groupId}
className="mx_RoomTile_name" className="mx_RoomTile_name mx_RoomTile_badgeShown"
dir="auto" dir="auto"
> >
{ groupName } { groupName }