Merge branch 'develop' into matthew/dharma

This commit is contained in:
Matthew Hodgson 2018-07-29 17:03:23 +01:00
commit 9783b6100d
211 changed files with 10766 additions and 4710 deletions

View file

@ -1,5 +1,6 @@
/*
Copyright 2015, 2016 OpenMarket 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.
@ -56,6 +57,10 @@ limitations under the License.
}
.mx_LeftPanel .mx_AppTile_mini {
height: 132px;
}
.mx_LeftPanel .mx_RoomList_scrollbar {
order: 1;