From 675b37a2faf09d1a2c5c261f48ef32799949b070 Mon Sep 17 00:00:00 2001
From: Atanas Janeshliev <atanas.janeshliev@proton.ch>
Date: Wed, 28 May 2025 10:20:12 +0200
Subject: [PATCH] chore: Jubilee Bridge 3.20.1 changelog.

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

diff --git a/Changelog.md b/Changelog.md
index 4e4c5e7f..e393aed0 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,12 @@
 Changelog [format](http://keepachangelog.com/en/1.0.0/)
 
 
+## Jubilee Bridge 3.20.1
+
+### Fixed
+* BRIDGE-362: Implemented logic for reconciling label conflicts.
+
+
 ## Jubilee Bridge 3.20.0
 
 ### Added
diff --git a/Makefile b/Makefile
index 49de275d..3b0f701d 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.0+git
+BRIDGE_APP_VERSION?=3.20.1+git
 APP_VERSION:=${BRIDGE_APP_VERSION}
 APP_FULL_NAME:=Proton Mail Bridge
 APP_VENDOR:=Proton AG