Merge branches 'develop' and 't3chguy/qrcode' of github.com:matrix-org/matrix-react-sdk into t3chguy/qrcode

Conflicts: package.json
2020-05-14 10:50:42 +01:00
parent 610fab7857 4a8e642400
commit 1ba19e78f8
476 changed files with 8624 additions and 2356 deletions
@@ -32,3 +32,9 @@ limitations under the License.
    padding: 10px;
 }

+.mx_RestoreKeyBackupDialog_content > div {
+    display: flex;
+    flex-direction: column;
+    justify-content: space-between;
+    min-height: 110px; /* Empirically measured */
+}