From ec905ffc2a4ebcdd70782c863a7f40d48df74824 Mon Sep 17 00:00:00 2001
From: "github-actions[bot] on behalf of s0undt3ch"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 13 Aug 2022 20:19:13 +0000
Subject: [PATCH] Update develop branch for the v2022.08.13 release

---
 CHANGELOG.md      | 9 +++++++++
 bootstrap-salt.sh | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc0fabe..2b06e7e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+# v2022.08.13
+
+## What's Changed
+
+- Fix test-windows workflow powershell syntax & Run pre-commit when resolving conflicts on the release workflow by @s0undt3ch in https://github.com/saltstack/salt-bootstrap/pull/1857
+- Update `*.sha256` files when merging develop into stable by @s0undt3ch in https://github.com/saltstack/salt-bootstrap/pull/1859
+
+**Full Changelog**: https://github.com/saltstack/salt-bootstrap/compare/v2022.08.12...v2022.08.13
+
 # v2022.08.12
 
 ## What's Changed
diff --git a/bootstrap-salt.sh b/bootstrap-salt.sh
index 7537a09..19e4124 100755
--- a/bootstrap-salt.sh
+++ b/bootstrap-salt.sh
@@ -23,7 +23,7 @@
 #======================================================================================================================
 set -o nounset                              # Treat unset variables as an error
 
-__ScriptVersion="2022.08.12"
+__ScriptVersion="2022.08.13"
 __ScriptName="bootstrap-salt.sh"
 
 __ScriptFullName="$0"