From f455ac64c375e846695828a5c9c293717bbfb4af Mon Sep 17 00:00:00 2001
From: su-ex <codeworks@supercable.onl>
Date: Thu, 26 Nov 2020 14:00:13 +0100
Subject: [PATCH] Merge upstream v1.7.14

---
 element-desktop  | 2 +-
 element-web      | 2 +-
 matrix-js-sdk    | 2 +-
 matrix-react-sdk | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/element-desktop b/element-desktop
index a50c169..a330567 160000
--- a/element-desktop
+++ b/element-desktop
@@ -1 +1 @@
-Subproject commit a50c16924fc9628512e8539b35cff7c41bcf361e
+Subproject commit a330567b87a746d6136d98fb6d33af9a51ffbd08
diff --git a/element-web b/element-web
index bb73fed..0db0e52 160000
--- a/element-web
+++ b/element-web
@@ -1 +1 @@
-Subproject commit bb73fedb2ab82c0194f0f9b9bdffb30414ab979b
+Subproject commit 0db0e522e24d443c1896698def670f9d35377ec9
diff --git a/matrix-js-sdk b/matrix-js-sdk
index f536e5c..79a5b44 160000
--- a/matrix-js-sdk
+++ b/matrix-js-sdk
@@ -1 +1 @@
-Subproject commit f536e5c6116667335218fa8b8dfe782b70f57200
+Subproject commit 79a5b44eb508074511c661eb3d92b3d6a26b0f33
diff --git a/matrix-react-sdk b/matrix-react-sdk
index c846b00..03016fd 160000
--- a/matrix-react-sdk
+++ b/matrix-react-sdk
@@ -1 +1 @@
-Subproject commit c846b00b3236e5c62000eae87d5608969ca00ec6
+Subproject commit 03016fd74eae9a3ce6d5c1a2400d0320d02e0a33