element-ios/Riot/Modules/Contacts/DataSources
Doug b9dc5d6eca Merge branch 'develop' into doug/4484_contacts_access
# Conflicts:
#	Riot/Assets/en.lproj/Vector.strings
#	Riot/Generated/Strings.swift
#	Riot/Modules/Application/LegacyAppDelegate.m
#	Riot/Modules/Settings/SettingsViewController.m
2021-09-30 11:14:02 +01:00
..
ContactsDataSource.h Hide local contacts in Unified Search. 2021-08-09 15:08:05 +01:00
ContactsDataSource.m Merge branch 'develop' into doug/4484_contacts_access 2021-09-30 11:14:02 +01:00