felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-22 17:42:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into gil/SP1_space_creation

Browse Source 
# Conflicts:
#	Config/BuildSettings.swift
#	Riot/Generated/Strings.swift
#	Riot/Modules/Home/HomeViewController.m
#	Riot/Modules/Room/Members/RoomParticipantsViewController.m
This commit is contained in:
Gil Eluard
2022-03-04 13:38:18 +01:00
parent dfda5f09d9 92d04ed872
commit da9c921efb
285 changed files with 18032 additions and 18206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Room/ParticipantsInviteModal/ContactsPicker/ContactsPickerViewModel.swift
+1 -1
View File
@@ -204,7 +204,7 @@ extension ContactsPickerViewModel: ContactsTableViewControllerDelegate {
let message = VectorL10n.roomParticipantsInvitePromptToMsg(contact.displayName, roomName)
coordinatorDelegate?.contactsPickerViewModel(self, display: message, title: VectorL10n.roomParticipantsInvitePromptTitle, actions: [
UIAlertAction(title: MatrixKitL10n.cancel, style: .cancel, handler: nil),
UIAlertAction(title: VectorL10n.cancel, style: .cancel, handler: nil),
UIAlertAction(title: VectorL10n.invite, style: .default, handler: { [weak self] action in
self?.invite(contact: contact)
})