From d1bc0d62585aad95422bd62b5de9a7749a2b4aa8 Mon Sep 17 00:00:00 2001
From: Lenny <lennart.grahl@threema.ch>
Date: Wed, 8 Jan 2025 19:29:41 +0100
Subject: [PATCH] Release v2.6.0

---
 CHANGELOG.md      | 9 +++++++++
 docker/rebuild.sh | 2 +-
 package-lock.json | 4 ++--
 package.json      | 2 +-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d63a17943..5cc633a2b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,13 @@ the full log, please refer to the git commit history.
 > but for now there will be no major new features or non-critical bugfixes.
 > See https://github.com/threema-ch/threema-web/pull/996 for more details.
 
+### [v2.6.0][v2.6.0] (2025-01-08)
+
+Changes:
+
+* [feature] Add support for displaying emoji reactions (only available when
+  supported by the mobile device) ([#1222][i1222])
+* [change] Allow Safari when connecting an Android device
 
 ### [v2.5.7][v2.5.7] (2024-10-25)
 
@@ -1307,7 +1314,9 @@ First public release.
 [i1200]: https://github.com/threema-ch/threema-web/issues/1200
 [i1202]: https://github.com/threema-ch/threema-web/issues/1202
 [i1220]: https://github.com/threema-ch/threema-web/pull/1220
+[i1222]: https://github.com/threema-ch/threema-web/pull/1222
 
+[v2.6.0]: https://github.com/threema-ch/threema-web/compare/v2.5.7...v2.6.0
 [v2.5.7]: https://github.com/threema-ch/threema-web/compare/v2.5.6...v2.5.7
 [v2.5.6]: https://github.com/threema-ch/threema-web/compare/v2.5.5...v2.5.6
 [v2.5.5]: https://github.com/threema-ch/threema-web/compare/v2.5.4...v2.5.5
diff --git a/docker/rebuild.sh b/docker/rebuild.sh
index e66ad5231..974879e40 100644
--- a/docker/rebuild.sh
+++ b/docker/rebuild.sh
@@ -13,7 +13,7 @@
 set -euo pipefail
 
 SUPPORTED_BRANCH_NAMES=("master")
-SUPPORTED_TAG_PATTERNS=("^v2.5.[0-9]$")
+SUPPORTED_TAG_PATTERNS=("^v2.[5-6].[0-9]$")
 IMAGE_NAME=threema/threema-web
 
 if [ "${1:-}" = "--dry-run" ]; then
diff --git a/package-lock.json b/package-lock.json
index ed36bdfc7..e5f92dd61 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "threema-web",
-  "version": "2.5.7",
+  "version": "2.6.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "threema-web",
-      "version": "2.5.7",
+      "version": "2.6.0",
       "license": "AGPL-3.0+",
       "dependencies": {
         "@babel/core": "^7.18.10",
diff --git a/package.json b/package.json
index a813938ce..2fa6fa35d 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "threema-web",
-  "version": "2.5.7",
+  "version": "2.6.0",
   "description": "Threema Webclient",
   "scripts": {
     "build": "npm run build:js && npm run build:css",