From 15ee6f17250a08a2a1302edad1479e79541faac8 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Tue, 15 Jun 2021 16:35:09 +0300 Subject: [PATCH] Release for QR fix --- .github/workflows/push-master.yml | 2 +- CHANGELOG.md | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/push-master.yml b/.github/workflows/push-master.yml index 13ad972fd1..bcac5c5e42 100644 --- a/.github/workflows/push-master.yml +++ b/.github/workflows/push-master.yml @@ -47,7 +47,7 @@ jobs: # only run on "CI skip", i.e. when the actual version has been bumped to release/stable electron: - if: "startsWith(github.event.head_commit.message, '[CI Skip] release/stable')" + # if: "startsWith(github.event.head_commit.message, '[CI Skip] release/stable')" strategy: matrix: os: [macos-latest, ubuntu-latest, windows-latest] diff --git a/CHANGELOG.md b/CHANGELOG.md index 966d765311..6150e76832 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # CHANGELOG +## 0.93.2-6 Jun 15, 2015 + +Contributed: + +- Fix Electon QR scanning on Mac (Thanks to https://github.com/wachulski) + + ## 0.93.1 Jun 14, 2021 Contributed: