Merge branch 'develop' into matthew/roomsettings2

2016-01-18 10:49:45 +00:00
parent 0553551d92 6e42d00727
commit 2a64d0feb3
7 changed files with 212 additions and 178 deletions
@@ -264,7 +264,7 @@ module.exports = React.createClass({
                else {
                    roomAvatar = (
                        <div onClick={this.props.onSettingsClick}>
-                            <RoomAvatar room={this.props.room} width="48" height="48"/>
+                            <RoomAvatar room={this.props.room} width={48} height={48}/>
                        </div>
                    );
                }