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

src/components/views/rooms/RoomSettings.js

@@ -1,6 +1,7 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
 Copyright 2017 Vector Creations Ltd
+Copyright 2018 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -1039,7 +1040,8 @@ module.exports = React.createClass({
 
                 <h3>{ _t('Advanced') }</h3>
                 <div className="mx_RoomSettings_settings">
-                    { _t('This room\'s internal ID is') } <code>{ this.props.room.roomId }</code>
+                    { _t('Internal room ID: ') } <code>{ this.props.room.roomId }</code><br />
+                    { _t('Room version number: ') } <code>{ this.props.room.getVersion() }</code>
                 </div>
             </div>
         );

src/i18n/strings/en_EN.json

@@ -540,7 +540,8 @@
     "Members only (since they joined)": "Members only (since they joined)",
     "Permissions": "Permissions",
     "Advanced": "Advanced",
-    "This room's internal ID is": "This room's internal ID is",
+    "Internal room ID: ": "Internal room ID: ",
+    "Room version number: ": "Room version number: ",
     "Add a topic": "Add a topic",
     "Search…": "Search…",
     "This Room": "This Room",