Merge branch 'master' into develop

CHANGELOG.md

@@ -1,3 +1,9 @@
+Changes in [1.7.7](https://github.com/vector-im/element-web/releases/tag/v1.7.7) (2020-09-14)
+=============================================================================================
+[Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.6...v1.7.7)
+
+ * Upgrade to React SDK 3.4.1
+
 Changes in [1.7.6](https://github.com/vector-im/element-web/releases/tag/v1.7.6) (2020-09-14)
 =============================================================================================
 [Full Changelog](https://github.com/vector-im/element-web/compare/v1.7.6-rc.1...v1.7.6)

package.json

@@ -1,7 +1,7 @@
 {
   "name": "riot-web",
   "productName": "Riot",
-  "version": "1.7.6",
+  "version": "1.7.7",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "repository": {
@@ -60,8 +60,8 @@
     "gfm.css": "^1.1.2",
     "highlight.js": "^9.13.1",
     "jsrsasign": "^9.1.5",
-    "matrix-js-sdk": "github:matrix-org/matrix-js-sdk#develop",
-    "matrix-react-sdk": "github:matrix-org/matrix-react-sdk#develop",
+    "matrix-js-sdk": "8.3.0",
+    "matrix-react-sdk": "3.4.1",
     "olm": "https://packages.matrix.org/npm/olm/olm-3.1.4.tgz",
     "prop-types": "^15.7.2",
     "react": "^16.9.0",

yarn.lock

@@ -7330,9 +7330,10 @@ matrix-mock-request@^1.2.3:
     bluebird "^3.5.0"
     expect "^1.20.2"
 
-"matrix-react-sdk@github:matrix-org/matrix-react-sdk#develop":
-  version "3.4.0"
-  resolved "https://codeload.github.com/matrix-org/matrix-react-sdk/tar.gz/148cad6ea2daecee3dc799616dc102698b0751f8"
+matrix-react-sdk@3.4.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/matrix-react-sdk/-/matrix-react-sdk-3.4.1.tgz#820fe83081c475f98158c4e9e71a3c8e1afa7c14"
+  integrity sha512-aAfMgJuutQas3rF+Z7iOOkOuhwYNG+ugq7bmF8CEs00IYY6UEfreqiqGBwnvTm+1b1Sdl6p2kjgil8941veCZg==
   dependencies:
     "@babel/runtime" "^7.10.5"
     await-lock "^2.0.1"