Merge branch 'beta'

# Conflicts:
#	submodules/SettingsUI/Sources/Data and Storage/EnergySavingSettingsScreen.swift
#	submodules/TelegramUI/Sources/ChatHistoryEntriesForView.swift
This commit is contained in:
Ali 2023-03-09 15:20:58 +04:00
commit b03044274f
2 changed files with 2 additions and 2 deletions

View File

@ -225,7 +225,7 @@ private func energeSavingSettingsScreenEntries(
} else if settings.energyUsageSettings.activationThreshold >= 96 { } else if settings.energyUsageSettings.activationThreshold >= 96 {
allText = presentationData.strings.PowerSaving_AllDescriptionAlways allText = presentationData.strings.PowerSaving_AllDescriptionAlways
} else { } else {
allText = presentationData.strings.PowerSaving_AllDescriptionLimit("\(settings.energyUsageSettings.activationThreshold)") allText = presentationData.strings.PowerSaving_AllDescriptionLimit("\(settings.energyUsageSettings.activationThreshold)").string
} }
entries.append(.allFooter(allText)) entries.append(.allFooter(allText))

View File

@ -1,5 +1,5 @@
{ {
"app": "9.5", "app": "9.5.1",
"bazel": "5.3.1", "bazel": "5.3.1",
"xcode": "14.2" "xcode": "14.2"
} }