Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor

Conflicts:
	synapse/storage/_base.py

1 files changed, 3 insertions, 1 deletions

diff --git a/webclient/rooms/rooms.html b/webclient/rooms/rooms.html

index f134e5ee8c..d303e143b9 100644
--- a/webclient/rooms/rooms.html
+++ b/webclient/rooms/rooms.html
@@ -1,7 +1,8 @@
 <div ng-controller="RoomsController" class="rooms">
 
     <div class="page">
-        
+    <div class="wrapper">
+            
     <div>
         <form>
             <input size="40" ng-model="newProfileInfo.name" ng-enter="setDisplayName(newProfileInfo.name)" />
@@ -77,4 +78,5 @@
     {{ feedback }}
 
     </div>    
+    </div>
 </div>