Merge branch 'develop' into matthew/status

This commit is contained in:
Matthew Hodgson 2017-10-26 01:47:22 +01:00
commit 1237de3ef0
38 changed files with 6827 additions and 1574 deletions

View file

@ -42,11 +42,11 @@ class FlairAvatar extends React.Component {
render() {
const httpUrl = this.context.matrixClient.mxcUrlToHttp(
this.props.groupProfile.avatarUrl, 14, 14, 'scale', false);
this.props.groupProfile.avatarUrl, 16, 16, 'scale', false);
return <img
src={httpUrl}
width="14px"
height="14px"
width="16"
height="16"
onClick={this.onClick}
title={this.props.groupProfile.groupId} />;
}