diff options
| author | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-08-12 11:56:15 +0200 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2025-08-12 11:56:15 +0200 |
| commit | 43551bc35b86a7329b0f1c4bad0485e89ea74c5e (patch) | |
| tree | 3808ae2a680e98b9f69af2e3461fab0fe57c20a6 | |
| parent | a054d3f1153e17d1834001c075a1556601770ad4 (diff) | |
| parent | ad96080c2142b4a6e3b28c9b6ff571413e066613 (diff) | |
| download | mullvadvpn-43551bc35b86a7329b0f1c4bad0485e89ea74c5e.tar.xz mullvadvpn-43551bc35b86a7329b0f1c4bad0485e89ea74c5e.zip | |
Merge branch 'port-android-app-2025.6-to-main'
| -rw-r--r-- | android/CHANGELOG.md | 5 | ||||
| -rw-r--r-- | dist-assets/android-version-code.txt | 2 | ||||
| -rw-r--r-- | dist-assets/android-version-name.txt | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/android/CHANGELOG.md b/android/CHANGELOG.md index 1e0107fed3..0c6b82b3c8 100644 --- a/android/CHANGELOG.md +++ b/android/CHANGELOG.md @@ -27,6 +27,11 @@ Line wrap the file at 100 chars. Th - Add support for devices with 16KB page size. +## [android/2025.6] - 2025-08-12 +### Fixed +- Remove redundant square for relays in custom list location list. + + ## [android/2025.6-beta3] - 2025-08-04 ### Fixed - Fix several crashes related to notifications. diff --git a/dist-assets/android-version-code.txt b/dist-assets/android-version-code.txt index 57c23756fe..cfb38bfc4c 100644 --- a/dist-assets/android-version-code.txt +++ b/dist-assets/android-version-code.txt @@ -1 +1 @@ -25061003 +25069000 diff --git a/dist-assets/android-version-name.txt b/dist-assets/android-version-name.txt index a52385479e..3490fb7070 100644 --- a/dist-assets/android-version-name.txt +++ b/dist-assets/android-version-name.txt @@ -1 +1 @@ -2025.6-beta3 +2025.6 |