Merge remote-tracking branch 'origin/develop' into dbkr/fix_user_links

src/components/structures/RoomView.js

@@ -116,6 +116,10 @@ module.exports = React.createClass({
             callState: null,
             guestsCanJoin: false,
             canPeek: false,
+
+            // error object, as from the matrix client/server API
+            // If we failed to load information about the room,
+            // store the error here.
             roomLoadError: null,
 
             // this is true if we are fully scrolled-down, and are looking at

src/components/views/rooms/RoomPreviewBar.js

@@ -41,6 +41,11 @@ module.exports = React.createClass({
         canPreview: React.PropTypes.bool,
         spinner: React.PropTypes.bool,
         room: React.PropTypes.object,
+
+        // The alias that was used to access this room, if appropriate
+        // If given, this will be how the room is referred to (eg.
+        // in error messages).
+        roomAlias: React.PropTypes.object,
     },
 
     getDefaultProps: function() {