From b4d90bafae4daa0107d13f77d0a9d6eb25503569 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 13 Nov 2023 12:04:39 +0000
Subject: [PATCH 1/6] Update build_macos.yaml

---
 .github/workflows/build_macos.yaml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build_macos.yaml b/.github/workflows/build_macos.yaml
index 615405a..b6097f5 100644
--- a/.github/workflows/build_macos.yaml
+++ b/.github/workflows/build_macos.yaml
@@ -67,7 +67,10 @@ jobs:
 
             - name: Build Natives
               if: steps.cache.outputs.cache-hit != 'true'
-              run: "yarn build:native:universal"
+              run:
+                  # Python 3.12 drops distutils which keytar relies on
+                  pip3 install setuptools
+                  yarn build:native:universal
 
             - name: "[Nightly] Resolve version"
               id: nightly

From 7bf2fbb0acc633beb7016282b8a39b8eef9de812 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 13 Nov 2023 12:09:18 +0000
Subject: [PATCH 2/6] Update build_macos.yaml

---
 .github/workflows/build_macos.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build_macos.yaml b/.github/workflows/build_macos.yaml
index b6097f5..4087d53 100644
--- a/.github/workflows/build_macos.yaml
+++ b/.github/workflows/build_macos.yaml
@@ -67,7 +67,7 @@ jobs:
 
             - name: Build Natives
               if: steps.cache.outputs.cache-hit != 'true'
-              run:
+              run: |
                   # Python 3.12 drops distutils which keytar relies on
                   pip3 install setuptools
                   yarn build:native:universal

From cdf3ce8fd6cc5256a0aefb869c8e70bbeae23b21 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 14 Nov 2023 16:29:15 +0000
Subject: [PATCH 3/6] v1.11.50-rc.0

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

diff --git a/package.json b/package.json
index 2792ecc..43b87bd 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
     "name": "element-desktop",
     "productName": "Element",
     "main": "lib/electron-main.js",
-    "version": "1.11.49",
+    "version": "1.11.50-rc.0",
     "description": "A feature-rich client for Matrix.org",
     "author": "Element",
     "homepage": "https://element.io",

From 509c0c56780a05a6cfb40d6481afab9ebb365937 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 14 Nov 2023 16:57:06 +0000
Subject: [PATCH 4/6] v1.11.50-rc.1

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

diff --git a/package.json b/package.json
index 43b87bd..86695b4 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
     "name": "element-desktop",
     "productName": "Element",
     "main": "lib/electron-main.js",
-    "version": "1.11.50-rc.0",
+    "version": "1.11.50-rc.1",
     "description": "A feature-rich client for Matrix.org",
     "author": "Element",
     "homepage": "https://element.io",

From de59ed995a75976487992f2f4223b6e69afbb73e Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Tue, 21 Nov 2023 11:35:12 +0000
Subject: [PATCH 5/6] Update release-gitflow.yml

---
 .github/workflows/release-gitflow.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/release-gitflow.yml b/.github/workflows/release-gitflow.yml
index c25bf52..a4d6f75 100644
--- a/.github/workflows/release-gitflow.yml
+++ b/.github/workflows/release-gitflow.yml
@@ -7,4 +7,5 @@ concurrency: ${{ github.repository }}-${{ github.workflow }}
 jobs:
     merge:
         uses: matrix-org/matrix-js-sdk/.github/workflows/release-gitflow.yml@develop
-        secrets: inherit
+        secrets:
+            ELEMENT_BOT_TOKEN: ${{ secrets.ELEMENT_BOT_TOKEN }}

From 6ef4c62fb188f800d7d86138446d461d78cd3da2 Mon Sep 17 00:00:00 2001
From: RiotRobot <releases@riot.im>
Date: Tue, 21 Nov 2023 11:49:03 +0000
Subject: [PATCH 6/6] v1.11.50

---
 CHANGELOG.md | 6 ++++++
 package.json | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f80a7a7..16d268f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Changes in [1.11.50](https://github.com/vector-im/element-desktop/releases/tag/v1.11.50) (2023-11-21)
+=====================================================================================================
+
+
+
+
 Changes in [1.11.49](https://github.com/vector-im/element-desktop/releases/tag/v1.11.49) (2023-11-13)
 =====================================================================================================
 
diff --git a/package.json b/package.json
index 86695b4..f9adc31 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
     "name": "element-desktop",
     "productName": "Element",
     "main": "lib/electron-main.js",
-    "version": "1.11.50-rc.1",
+    "version": "1.11.50",
     "description": "A feature-rich client for Matrix.org",
     "author": "Element",
     "homepage": "https://element.io",