Merge branch 'develop' into fayed/fix-verification-dialog

This commit is contained in:
Faye Duxovni 2021-10-05 08:48:52 -04:00
commit 651e943b31
145 changed files with 5361 additions and 1938 deletions

View file

@ -89,7 +89,6 @@ limitations under the License.
margin: 0px auto;
overflow: auto;
flex: 0 0 auto;
}
.mx_RoomView_auxPanel_fullHeight {

View file

@ -122,7 +122,7 @@ limitations under the License.
float: right;
font-size: $font-12px;
line-height: $font-22px;
color: $muted-fg-color;
color: $secondary-content;
}
}