Merge remote-tracking branch 'origin/develop' into dbkr/tiny_jitsi_follows_you_between_rooms

2018-07-16 17:21:51 +01:00
parent ff96537048 379d65bd6c
commit a79caed0c9
45 changed files with 1409 additions and 1179 deletions
@@ -176,10 +176,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 {