From 447c133d824d63fdddfb29196c6554244f24128b Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 30 Aug 2018 14:38:15 +0100
Subject: [PATCH 01/12] js-sdk & react-sdk rc.1

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 12396858..a1fa4c6b 100644
--- a/package.json
+++ b/package.json
@@ -64,8 +64,8 @@
     "gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279",
     "gfm.css": "^1.1.1",
     "highlight.js": "^9.0.0",
-    "matrix-js-sdk": "0.10.8",
-    "matrix-react-sdk": "0.13.2",
+    "matrix-js-sdk": "0.10.9-rc.1",
+    "matrix-react-sdk": "0.13.3-rc.1",
     "modernizr": "^3.1.0",
     "prop-types": "^15.5.10",
     "react": "^15.6.0",

From 2bef30635cef36e2a0aa3b1aedaef1c814e586f1 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 30 Aug 2018 14:39:12 +0100
Subject: [PATCH 02/12] v0.16.3-rc.1

---
 electron_app/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/electron_app/package.json b/electron_app/package.json
index f92dd63c..7c734f71 100644
--- a/electron_app/package.json
+++ b/electron_app/package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "src/electron-main.js",
-  "version": "0.16.2",
+  "version": "0.16.3-rc.1",
   "description": "A feature-rich client for Matrix.org",
   "author": "Vector Creations Ltd.",
   "dependencies": {

From 01f4e9b2a5798c33d033ad1d54ffe43e8c6da6fb Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 30 Aug 2018 14:40:21 +0100
Subject: [PATCH 03/12] Prepare changelog for v0.16.3-rc.1

---
 CHANGELOG.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eae5b848..f7800832 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+Changes in [0.16.3-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.16.3-rc.1) (2018-08-30)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.2...v0.16.3-rc.1)
+
+ * Update from Weblate.
+   [\#7245](https://github.com/vector-im/riot-web/pull/7245)
+ * Revert "Remove package-lock.json for now"
+   [\#7128](https://github.com/vector-im/riot-web/pull/7128)
+ * Remove package-lock.json for now
+   [\#7115](https://github.com/vector-im/riot-web/pull/7115)
+
 Changes in [0.16.2](https://github.com/vector-im/riot-web/releases/tag/v0.16.2) (2018-08-23)
 ============================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.1...v0.16.2)

From 7cfda97b8289fdeb30536332ac62e164d51822a2 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Thu, 30 Aug 2018 14:40:22 +0100
Subject: [PATCH 04/12] v0.16.3-rc.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index a1fa4c6b..6860ecac 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "electron_app/src/electron-main.js",
-  "version": "0.16.2",
+  "version": "0.16.3-rc.1",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "repository": {

From 2b91595aa96f3b64cec098ed4c38a69c1ab2f33e Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 31 Aug 2018 13:50:12 +0100
Subject: [PATCH 05/12] js-sdk & react-sdk rc.2

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 6860ecac..38876057 100644
--- a/package.json
+++ b/package.json
@@ -64,8 +64,8 @@
     "gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279",
     "gfm.css": "^1.1.1",
     "highlight.js": "^9.0.0",
-    "matrix-js-sdk": "0.10.9-rc.1",
-    "matrix-react-sdk": "0.13.3-rc.1",
+    "matrix-js-sdk": "0.10.9-rc.2",
+    "matrix-react-sdk": "0.13.3-rc.2",
     "modernizr": "^3.1.0",
     "prop-types": "^15.5.10",
     "react": "^15.6.0",

From 9e4aa50567eb5ce14e02fdeb2f3d1ad875af4cf3 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 31 Aug 2018 13:50:57 +0100
Subject: [PATCH 06/12] v0.16.3-rc.2

---
 electron_app/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/electron_app/package.json b/electron_app/package.json
index 7c734f71..c327404e 100644
--- a/electron_app/package.json
+++ b/electron_app/package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "src/electron-main.js",
-  "version": "0.16.3-rc.1",
+  "version": "0.16.3-rc.2",
   "description": "A feature-rich client for Matrix.org",
   "author": "Vector Creations Ltd.",
   "dependencies": {

From 1db5c64f3ef73af32c40a46db6fe3d4648c36540 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 31 Aug 2018 13:52:58 +0100
Subject: [PATCH 07/12] Prepare changelog for v0.16.3-rc.2

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7800832..ab1aaf8b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [0.16.3-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.16.3-rc.2) (2018-08-31)
+======================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.3-rc.1...v0.16.3-rc.2)
+
+ * Update js-sdk to fix an exception causing the room list to become unresponsive.
+
 Changes in [0.16.3-rc.1](https://github.com/vector-im/riot-web/releases/tag/v0.16.3-rc.1) (2018-08-30)
 ======================================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.2...v0.16.3-rc.1)

From 5170635a1f117bebc54053a85d11cea309869cf2 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Fri, 31 Aug 2018 13:52:58 +0100
Subject: [PATCH 08/12] v0.16.3-rc.2

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 38876057..5f523b0e 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "electron_app/src/electron-main.js",
-  "version": "0.16.3-rc.1",
+  "version": "0.16.3-rc.2",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "repository": {

From 6231cf34966cbe2eb39e6fd7b2baa90ef9c65080 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 3 Sep 2018 14:28:34 +0100
Subject: [PATCH 09/12] Released js-sdk & react-sdk

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 5f523b0e..9024e967 100644
--- a/package.json
+++ b/package.json
@@ -64,8 +64,8 @@
     "gemini-scrollbar": "matrix-org/gemini-scrollbar#b302279",
     "gfm.css": "^1.1.1",
     "highlight.js": "^9.0.0",
-    "matrix-js-sdk": "0.10.9-rc.2",
-    "matrix-react-sdk": "0.13.3-rc.2",
+    "matrix-js-sdk": "0.10.9",
+    "matrix-react-sdk": "0.13.3",
     "modernizr": "^3.1.0",
     "prop-types": "^15.5.10",
     "react": "^15.6.0",

From c150d97eaf195554f9662c5f564c3cb1f45053dc Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 3 Sep 2018 14:29:48 +0100
Subject: [PATCH 10/12] v0.16.3

---
 electron_app/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/electron_app/package.json b/electron_app/package.json
index c327404e..9e5cada1 100644
--- a/electron_app/package.json
+++ b/electron_app/package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "src/electron-main.js",
-  "version": "0.16.3-rc.2",
+  "version": "0.16.3",
   "description": "A feature-rich client for Matrix.org",
   "author": "Vector Creations Ltd.",
   "dependencies": {

From 207106ea46173dd1777dbb8ef0622abadd15b7c6 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 3 Sep 2018 14:34:05 +0100
Subject: [PATCH 11/12] Prepare changelog for v0.16.3

---
 CHANGELOG.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab1aaf8b..1df33ec8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+Changes in [0.16.3](https://github.com/vector-im/riot-web/releases/tag/v0.16.3) (2018-09-03)
+============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.3-rc.2...v0.16.3)
+
+ * SECURITY FIX: This version (and release candidates) pull in an upstream security
+   fix from electron to fix CVE-2018-15685. Electron users should update as soon as
+   possible. Riot-web run outsiude of Electron is unaffected.
+
 Changes in [0.16.3-rc.2](https://github.com/vector-im/riot-web/releases/tag/v0.16.3-rc.2) (2018-08-31)
 ======================================================================================================
 [Full Changelog](https://github.com/vector-im/riot-web/compare/v0.16.3-rc.1...v0.16.3-rc.2)

From d00ca02c25010b875786eae618cd2ea4e2c9c296 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Mon, 3 Sep 2018 14:34:06 +0100
Subject: [PATCH 12/12] v0.16.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 9024e967..e67ab63a 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "riot-web",
   "productName": "Riot",
   "main": "electron_app/src/electron-main.js",
-  "version": "0.16.3-rc.2",
+  "version": "0.16.3",
   "description": "A feature-rich client for Matrix.org",
   "author": "New Vector Ltd.",
   "repository": {