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

Conflicts: src/components/views/dialogs/AddExistingToSpaceDialog.tsx
2021-07-05 13:06:22 +01:00
parent 89949bd884 1b95762910
commit 1b25ab930e
27 changed files with 178 additions and 123 deletions
@@ -28,6 +28,7 @@ limitations under the License.
        left: 0;
        top: 2px; // alignment
        background-image: url("$(res)/img/element-icons/warning-badge.svg");
+        background-size: contain;
    }

    .mx_AccessSecretStorageDialog_reset_link {