Merge branch 'develop' into matthew/dharma
This commit is contained in:
commit
9783b6100d
211 changed files with 10766 additions and 4710 deletions
|
@ -173,10 +173,7 @@ hr.mx_RoomView_myReadMarker {
|
|||
z-index: 1000;
|
||||
overflow: hidden;
|
||||
|
||||
-webkit-transition: all .2s ease-out;
|
||||
-moz-transition: all .2s ease-out;
|
||||
-ms-transition: all .2s ease-out;
|
||||
-o-transition: all .2s ease-out;
|
||||
transition: all .2s ease-out;
|
||||
}
|
||||
|
||||
.mx_RoomView_statusArea_expanded {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue