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

@ -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 {