diff options
| author | David Göransson <david.goransson@mullvad.net> | 2025-03-26 13:43:11 +0100 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2025-03-26 13:43:11 +0100 |
| commit | 2513223f4043cf60f8b6ae6e654f49a6beacec9a (patch) | |
| tree | e3e2749eabdc02ee0cdb5e9a9c50cdb99155220f | |
| parent | 430f8a3455aa75e61deebe3eea4e96c4360e147d (diff) | |
| parent | 8e1c87efada0601ab12fb54f257b3bd0755c09f6 (diff) | |
| download | mullvadvpn-2513223f4043cf60f8b6ae6e654f49a6beacec9a.tar.xz mullvadvpn-2513223f4043cf60f8b6ae6e654f49a6beacec9a.zip | |
Merge branch 'port-android-app-2025.1-to-main'
| -rw-r--r-- | android/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | dist-assets/android-version-code.txt | 2 | ||||
| -rw-r--r-- | dist-assets/android-version-name.txt | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/android/CHANGELOG.md b/android/CHANGELOG.md index 9d7c4963a8..98c8c776ba 100644 --- a/android/CHANGELOG.md +++ b/android/CHANGELOG.md @@ -40,6 +40,10 @@ Line wrap the file at 100 chars. Th - Will no longer try to connect using an IP version if that IP version is not available. +## [android/2025.1] - 2025-03-20 +Identical to `android/2025.1-beta1` + + ## [android/2025.1-beta1] - 2025-03-05 ### Fixed - Fix a crash that could occur in the Filter screen. diff --git a/dist-assets/android-version-code.txt b/dist-assets/android-version-code.txt index df97a27249..085dc48100 100644 --- a/dist-assets/android-version-code.txt +++ b/dist-assets/android-version-code.txt @@ -1 +1 @@ -25011001 +25019000 diff --git a/dist-assets/android-version-name.txt b/dist-assets/android-version-name.txt index b3414b9313..ad44fbabbb 100644 --- a/dist-assets/android-version-name.txt +++ b/dist-assets/android-version-name.txt @@ -1 +1 @@ -2025.1-beta1 +2025.1 |