diff options
author | Erik Johnston <erik@matrix.org> | 2014-08-14 10:01:04 +0100 |
---|---|---|
committer | Erik Johnston <erik@matrix.org> | 2014-08-14 10:01:04 +0100 |
commit | 10294b60824347d73b01f7ce4add18467d1e6f0c (patch) | |
tree | 06d04a0a2e0ccf183bfc602ce9694d5958ed7a2e /webclient/rooms/rooms.html | |
parent | Make feedback table also store sender. (diff) | |
parent | grammar fix (diff) | |
download | synapse-10294b60824347d73b01f7ce4add18467d1e6f0c.tar.xz |
Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor
Conflicts: synapse/storage/_base.py
Diffstat (limited to 'webclient/rooms/rooms.html')
-rw-r--r-- | webclient/rooms/rooms.html | 4 |
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> |