Merge branch 'develop' of github.com:matrix-org/matrix-react-sdk into t3chguy/socials

Conflicts: src/i18n/strings/en_EN.json
2020-12-01 16:33:29 +00:00
parent 26e1cdb82c 2d74bb0dcc
commit eb25c39318
33 changed files with 825 additions and 206 deletions
@@ -22,7 +22,7 @@

    iframe {
        // Sticker picker depends on the fixed height previously used for all tiles
-        height: 273px;
+        height: 283px; // height of the popout minus the AppTile menu bar
    }
 }