From dc003b9c05a149ae74a6f9920bc1d9f6a1538041 Mon Sep 17 00:00:00 2001
From: Niall Farrell <nfarrell@kx.com>
Date: Wed, 31 Jan 2024 14:40:35 +0000
Subject: [PATCH] Merge branch 'main' into dev

---
 CHANGELOG.md      | 10 ++++++++--
 package-lock.json |  4 ++--
 package.json      |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1311c802..46264251 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -59,14 +59,20 @@ All notable changes to the kdb extension will be documented in this file.
 
 - Fixed various CVEs
 
+# v1.2.1
+
+### Fixes
+
+- Documentation fixes
+
 # v1.2.0
 
 ### Enhancements
 
-- Execution of Python code on server
+- Execution of Python code on kdb Insights Enterprise
 - Rename symbol support
 - Basic linting support
-- KDB/q REPL flow
+- kdb+/q REPL flow
 
 ### Fixes
 
diff --git a/package-lock.json b/package-lock.json
index cc18b8b7..f6c9f97c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "kdb",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "kdb",
-      "version": "1.2.0",
+      "version": "1.2.1",
       "license": "MIT",
       "dependencies": {
         "@types/antlr4": "^4.11.6",
diff --git a/package.json b/package.json
index a3483557..43fd7a99 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "displayName": "kdb",
   "description": "IDE support for kdb product suite",
   "publisher": "KX",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "engines": {
     "vscode": "^1.75.0"
   },