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
..
Assets	Merge branch 'develop' into doug/4484_contacts_access	2021-09-30 11:14:02 +01:00
Categories	Merge branch 'spaces' into gil/4498_Handle_space_link	2021-09-23 15:26:29 +02:00
Coordinators	Fix class keyword deprecation warnings everywhere!	2021-07-09 17:05:43 +01:00
Generated	Merge branch 'develop' into doug/4484_contacts_access	2021-09-30 11:14:02 +01:00
Managers	Merge branch 'develop' into doug/4484_contacts_access	2021-09-30 11:14:02 +01:00
Model	[Spaces] Show suggested in room lists #4501	2021-08-03 13:45:22 +02:00
Modules	Merge branch 'develop' into doug/4484_contacts_access	2021-09-30 11:14:02 +01:00
PropertyWrappers	Using a property wrapper for UserDefaults backed application settings (RiotSettings).	2021-08-30 11:02:06 +03:00
Routers	Fix class keyword deprecation warnings everywhere!	2021-07-09 17:05:43 +01:00
SupportingFiles	[Spaces] M10.6.1 Handle space link #4498	2021-09-22 14:58:19 +02:00
Utils	vector-im/element-ios/issues/4899 - Replaced (*almost*) all NSLocalizedString calls with newly generated ObjC methods.	2021-09-30 09:40:12 +03:00
Common.xcconfig	Include AppVersion.xcconfig in all Common.xcconfig.	2021-08-16 11:35:09 +02:00
Debug.xcconfig	XcodeGen: Use same names for yml and xcconfig files in every target	2021-02-11 09:21:00 +01:00
Release.xcconfig	XcodeGen: Use same names for yml and xcconfig files in every target	2021-02-11 09:21:00 +01:00
target.yml	Add template unit tests and publisher utility.	2021-09-08 15:32:41 +01:00