From 48a75b0dd761af7c90c30b964844c4a37a406a4a Mon Sep 17 00:00:00 2001
From: Xavier Michelon <xavier.michelon@proton.ch>
Date: Thu, 6 Jun 2024 10:10:36 +0200
Subject: [PATCH] chore: Bastei Bridge 3.12.0 changelog.

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

diff --git a/Changelog.md b/Changelog.md
index 058dfe7d..8703e786 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -3,6 +3,27 @@
 Changelog [format](http://keepachangelog.com/en/1.0.0/)
 
 
+## Bastei Bridge 3.12.0
+
+### Added
+* BRIDGE-79: Add New Outlook for Mac KB disclaimer.
+
+### Changed
+* BRIDGE-75: Bridge repair button.
+* BRIDGE-16: Bump version Go 1.21.9 Qt 6.4.3.
+* BRIDGE-23: Update gluon to go 1.21.
+* BRIDGE-22: Update gpa to go 1.21.
+
+### Fixed
+* BRIDGE-90: Disable repair button when bridge cannot connect to proton servers; bump GPA.
+* BRIDGE-69: Explicitly handle semver panic for last bridge version from vault.
+* BRIDGE-29: Bump gluon version.
+* BRIDGE-49: Configure gitleaks baseline and grype config.
+* BRIDGE-21: Missing panic handling.
+* BRIDGE-17: Broken telemetry heartbeat test.
+* BRIDGE-10: Bumped gluon version.
+
+
 ## Alcantara Bridge 3.11.1
 
 ### Fixed
diff --git a/Makefile b/Makefile
index ae56ef97..22f6e279 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.11.1+git
+BRIDGE_APP_VERSION?=3.12.0+git
 APP_VERSION:=${BRIDGE_APP_VERSION}
 APP_FULL_NAME:=Proton Mail Bridge
 APP_VENDOR:=Proton AG