From 05c37a108bc515d3983e2be9cea73c3145719e26 Mon Sep 17 00:00:00 2001
From: Keith Rocheck <749812+krocheck@users.noreply.github.com>
Date: Wed, 1 Nov 2023 12:57:55 -0400
Subject: [PATCH] chore: v3.1.2

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 57e50e1a9d..40acb7c47d 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,33 @@
 # Bitfocus Companion
 
+## Companion v3.1.2 - Release Notes
+
+### 🐞 BUG FIXES
+
+- Fixed xkeys unable to show colours
+- Fixed https binding to wrong port at startup (#2610)
+- Fixed switching between version branches failing on windows
+- Fixed crash with fresh config (#2557, #2615)
+- Added default for lastUpgradeIndex (#2627)
+- Updated some vulnerable dependencies
+- Ensured timed triggers dont trigger when enabled unexpectedly (#2626)
+- Fixed handle missing property in import (#2627)
+
+### 🐞 MODULE FIXES
+
+- dataton-watchout
+- etc-eos
+- generic-mqtt
+- globalcache-itac-cc
+- grassvalley-amp
+- presentationtools-aps
+- ptzoptics-visca
+- qsys-remote-control
+- shelly-ws
+- softron-movierecorder
+- videolan-vlc
+- vistream-online
+
 ## Companion v3.1.1 - Release Notes
 
 ### 🐞 BUG FIXES
diff --git a/package.json b/package.json
index 32b8071d9c..acd84d087f 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "companion",
-	"version": "3.1.1",
+	"version": "3.1.2",
 	"description": "Companion",
 	"main": "main.js",
 	"type": "module",