summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDavid Göransson <david.goransson@mullvad.net>2025-07-25 15:21:50 +0200
committerDavid Göransson <david.goransson@mullvad.net>2025-07-25 15:21:50 +0200
commit427ebeed0f7004357ddc3dcd2c72330b0373ca9b (patch)
treebe9959755dcd48aaf56c22814cc9796214028f64
parent1a8ea02ce90e28d764bcc58cc05bb09fd5e396be (diff)
parentf35b1eec918cf54a4736e33dea1812a3fcb5d33a (diff)
downloadmullvadvpn-427ebeed0f7004357ddc3dcd2c72330b0373ca9b.tar.xz
mullvadvpn-427ebeed0f7004357ddc3dcd2c72330b0373ca9b.zip
Merge branch 'port-android-app-2025.6-beta2-to-main'
-rw-r--r--android/CHANGELOG.md5
-rw-r--r--dist-assets/android-version-code.txt2
-rw-r--r--dist-assets/android-version-name.txt2
3 files changed, 7 insertions, 2 deletions
diff --git a/android/CHANGELOG.md b/android/CHANGELOG.md
index e226ac3551..5a583365fd 100644
--- a/android/CHANGELOG.md
+++ b/android/CHANGELOG.md
@@ -26,6 +26,11 @@ Line wrap the file at 100 chars. Th
- Add list of recent server selections in the select location view.
+## [android/2025.6-beta2] - 2025-07-18
+### Fixed
+- Fix a crash related to the selected relay location.
+
+
## [android/2025.6-beta1] - 2025-07-17
### Added
- Add Memory Tagging (MTE) opt-in flag to enable it by default on supported Android versions and
diff --git a/dist-assets/android-version-code.txt b/dist-assets/android-version-code.txt
index 751c25065b..969d475f17 100644
--- a/dist-assets/android-version-code.txt
+++ b/dist-assets/android-version-code.txt
@@ -1 +1 @@
-25061001
+25061002
diff --git a/dist-assets/android-version-name.txt b/dist-assets/android-version-name.txt
index 5125f5e129..cfc6c3004a 100644
--- a/dist-assets/android-version-name.txt
+++ b/dist-assets/android-version-name.txt
@@ -1 +1 @@
-2025.6-beta1
+2025.6-beta2