merged basis update 1_10_5 into develop

This commit is contained in:
Arnfried Griesert
2023-03-21 07:52:11 +01:00
173 changed files with 2455 additions and 857 deletions
@@ -21,8 +21,7 @@ struct MentionsAndKeywordNotificationSettings: View {
var keywordSection: some View {
SwiftUI.Section(
header: FormSectionHeader(text: VectorL10n.settingsYourKeywords),
footer: FormSectionFooter(text: VectorL10n.settingsMentionsAndKeywordsEncryptionNotice)
header: FormSectionHeader(text: VectorL10n.settingsYourKeywords)
) {
NotificationSettingsKeywords(viewModel: viewModel)
}