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

2021-06-29 11:31:30 +05:30
parent 6cbbc0ecb4 b6d9ecde8b
commit 637e3afa48
24 changed files with 461 additions and 312 deletions
@@ -34,7 +34,7 @@ limitations under the License.
    > .mx_ForwardDialog_preview {
        max-height: 30%;
        flex-shrink: 0;
-        overflow: scroll;
+        overflow-y: auto;

        div {
            pointer-events: none;