Merge branch 'develop' into luke/merge-RoomTile-context-menus
Conflicts: src/components/views/context_menus/RoomTagContextMenu.js
This commit is contained in:
commit
e4c155a881
13 changed files with 135 additions and 72 deletions
|
@ -18,6 +18,8 @@ limitations under the License.
|
|||
.mx_HomePage {
|
||||
max-width: 960px;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
overflow-y: hidden;
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue