Merge branch 'kegan/controller-merging' into kegan/controller-merging2

pull/421/head
Kegan Dougal 2015-11-26 14:31:31 +00:00
commit f21b6203ed
1 changed files with 1 additions and 1 deletions

View File

@ -37,7 +37,7 @@ module.exports = React.createClass({
}, },
render: function() { render: function() {
var RoomAvatar = sdk.getComponent('atoms.RoomAvatar'); var RoomAvatar = sdk.getComponent('avatars.RoomAvatar');
var avatarImg; var avatarImg;
// Having just set an avatar we just display that since it will take a little // Having just set an avatar we just display that since it will take a little
// time to propagate through to the RoomAvatar. // time to propagate through to the RoomAvatar.