Skip to content

Commit 77f2e47

Browse files
committed
Merge branch 'release/2.7.2' into develop
2 parents 0b18d52 + 0cdbb54 commit 77f2e47

File tree

7 files changed

+9
-8
lines changed

7 files changed

+9
-8
lines changed

Cryptomator.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3376,7 +3376,7 @@
33763376
GCC_WARN_UNUSED_FUNCTION = YES;
33773377
GCC_WARN_UNUSED_VARIABLE = YES;
33783378
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
3379-
MARKETING_VERSION = 2.7.1;
3379+
MARKETING_VERSION = 2.7.2;
33803380
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
33813381
MTL_FAST_MATH = YES;
33823382
ONLY_ACTIVE_ARCH = YES;
@@ -3438,7 +3438,7 @@
34383438
GCC_WARN_UNUSED_FUNCTION = YES;
34393439
GCC_WARN_UNUSED_VARIABLE = YES;
34403440
IPHONEOS_DEPLOYMENT_TARGET = 14.0;
3441-
MARKETING_VERSION = 2.7.1;
3441+
MARKETING_VERSION = 2.7.2;
34423442
MTL_ENABLE_DEBUG_INFO = NO;
34433443
MTL_FAST_MATH = YES;
34443444
OTHER_SWIFT_FLAGS = "-Xfrontend -warn-long-expression-type-checking=200 -Xfrontend -warn-long-function-bodies=200";

CryptomatorTests/Purchase/PurchaseViewModelTests.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,9 @@ class PurchaseViewModelTests: IAPViewModelTestCase {
168168
}
169169

170170
private var lifetimeLicenseCell: Item {
171+
let productDetail = SalePromo.isAutumn2025Active() ? "\(SalePromo.autumn2025Emoji) \(SalePromo.autumn2025Discount)" : nil
171172
return .purchaseCell(.init(productName: LocalizedString.getValue("purchase.product.lifetimeLicense"),
172-
productDetail: nil,
173+
productDetail: productDetail,
173174
price: "$11.99",
174175
purchaseDetail: LocalizedString.getValue("purchase.product.lifetimeLicense.duration"),
175176
productIdentifier: .fullVersion))

fastlane/changelog.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
- Fixed endless loading when calculating cache size in settings.
1+
- Fixed WebDAV account loading and vault deletion issues (#415).
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
- Endloses Laden beim Berechnen der Cache-Größe in den Einstellungen behoben.
1+
- Probleme beim Laden von WebDAV-Konten und beim Löschen von Tresoren behoben (#415).
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
- Fixed endless loading when calculating cache size in settings.
1+
- Fixed WebDAV account loading and vault deletion issues (#415).
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
- Endloses Laden beim Berechnen der Cache-Größe in den Einstellungen behoben.
1+
- Probleme beim Laden von WebDAV-Konten und beim Löschen von Tresoren behoben (#415).
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
- Fixed endless loading when calculating cache size in settings.
1+
- Fixed WebDAV account loading and vault deletion issues (#415).

0 commit comments

Comments
 (0)