Merge branch 'kegan/controller-merging' into kegan/controller-merging2
						commit
						f21b6203ed
					
				| 
						 | 
				
			
			@ -37,7 +37,7 @@ module.exports = React.createClass({
 | 
			
		|||
    },
 | 
			
		||||
 | 
			
		||||
    render: function() {
 | 
			
		||||
        var RoomAvatar = sdk.getComponent('atoms.RoomAvatar');
 | 
			
		||||
        var RoomAvatar = sdk.getComponent('avatars.RoomAvatar');
 | 
			
		||||
        var avatarImg;
 | 
			
		||||
        // Having just set an avatar we just display that since it will take a little
 | 
			
		||||
        // time to propagate through to the RoomAvatar.
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue