From 50ab740b929519e1198987411dfe79ed10504951 Mon Sep 17 00:00:00 2001
From: Atanas Janeshliev <atanas.janeshliev@proton.ch>
Date: Thu, 5 Jun 2025 15:45:27 +0200
Subject: [PATCH] chore: Kanmon Bridge 3.21.0 changelog.

---
 Changelog.md | 16 ++++++++++++++++
 Makefile     |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/Changelog.md b/Changelog.md
index e393aed0..85ea39f2 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,22 @@
 Changelog [format](http://keepachangelog.com/en/1.0.0/)
 
 
+## Kanmon Bridge 3.21.0
+
+### Added 
+* BRIDGE-379: Mailbox pre-check on Bridge startup & conflict resolver for Bridge internal mailboxes. 
+
+### Changed
+* BRIDGE-376: Explicitly catch Gluon DB mailbox name conflicts and report them to Sentry.
+* BRIDGE-373: Extend user mailbox conflict resolver logging & report sync errors to Sentry.
+* BRIDGE-366: Kill switch support for IMAP IDLE.
+* BRIDGE-363: Observability metric support for IMAP connections.
+
+### Fixed
+* BRIDGE-377: Correct API label field usage on user label conflict resolver - update handler (event loop).
+* BRIDGE-378: Fix incorrect field usage for system mailbox names.
+
+
 ## Jubilee Bridge 3.20.1
 
 ### Fixed
diff --git a/Makefile b/Makefile
index 3b0f701d..ecc3e3e7 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ ROOT_DIR:=$(realpath .)
 .PHONY: build build-gui build-nogui build-launcher versioner hasher
 
 # Keep version hardcoded so app build works also without Git repository.
-BRIDGE_APP_VERSION?=3.20.1+git
+BRIDGE_APP_VERSION?=3.21.0+git
 APP_VERSION:=${BRIDGE_APP_VERSION}
 APP_FULL_NAME:=Proton Mail Bridge
 APP_VENDOR:=Proton AG