Merge branch 'develop' of git+ssh://github.com/vector-im/vector-web into matthew/redesign

src/skins/vector/views/atoms/RoomAvatar.js

@@ -43,9 +43,13 @@ module.exports = React.createClass({
     },
 
     render: function() {
+        var style = {
+            maxWidth: this.props.width,
+            maxHeight: this.props.height,
+        };
         return (
             <img className="mx_RoomAvatar" src={this.state.imageUrl} onError={this.onError}
-                width={this.props.width} height={this.props.height}
+                style={style}
             />
         );
     }