summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorMarkus Pettersson <markus.pettersson@mullvad.net>2025-05-19 15:31:04 +0200
committerMarkus Pettersson <markus.pettersson@mullvad.net>2025-05-19 15:31:04 +0200
commit2898ca982570d89415fd30e929b0ae7a0bcaab14 (patch)
tree97cce3169288d0a2d0f6b1f995c62cdd4c28a7e0
parent881f5ad287564648daf49927c251ec182417b4be (diff)
parent558b8184d08c3196dc8114c40a62845e62c5a8ee (diff)
downloadmullvadvpn-2898ca982570d89415fd30e929b0ae7a0bcaab14.tar.xz
mullvadvpn-2898ca982570d89415fd30e929b0ae7a0bcaab14.zip
Merge branch 'backport-2025.6-changes'
-rw-r--r--CHANGELOG.md4
-rw-r--r--dist-assets/desktop-product-version.txt2
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 646aca1814..a326bff31c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -55,6 +55,10 @@ supported.
Egor Filatov (Positive Technologies).
+## [2025.6] - 2025-05-13
+This release is identical to 2025.6-beta2.
+
+
## [2025.6-beta2] - 2025-05-07
### Fixed
- Fix "No OpenVPN servers" warning being displayed erroneously.
diff --git a/dist-assets/desktop-product-version.txt b/dist-assets/desktop-product-version.txt
index cfc6c3004a..3490fb7070 100644
--- a/dist-assets/desktop-product-version.txt
+++ b/dist-assets/desktop-product-version.txt
@@ -1 +1 @@
-2025.6-beta2
+2025.6