SBiOSoftWhare 790604dad1 Merge branch 'develop' into steve/5723_lls_screen ... # Conflicts: # Riot/Assets/en.lproj/Vector.strings # Riot/Generated/Strings.swift # RiotSwiftUI/Modules/Room/LocationSharing/Coordinator/ShareLocationActivityController.swift # RiotSwiftUI/Modules/Room/LocationSharing/MapViewErrorAlertInfoBuilder.swift		2022-04-22 12:15:34 +02:00
..
Assets	Merge branch 'develop' into steve/5723_lls_screen	2022-04-22 12:15:34 +02:00
Categories	Rename NOTIFICATION key to Notification for missing translations.	2022-04-08 14:14:34 +01:00
Coordinators	Fix class keyword deprecation warnings everywhere!	2021-07-09 17:05:43 +01:00
Generated	Merge branch 'develop' into steve/5723_lls_screen	2022-04-22 12:15:34 +02:00
Managers	Merge branch 'develop' into ismail/5770_threads_notice	2022-03-30 13:35:14 +03:00
Model	Enable nilability on Jitsi server URL	2022-03-22 14:10:09 +01:00
Modules	Log decryption error details as context in AnalyticsEvent	2022-04-19 16:09:46 +01:00
PropertyWrappers	Fix compiler issue	2021-10-05 14:08:05 +03:00
Routers	SP2: Adding Rooms to Spaces #523o	2022-02-17 14:02:52 +01:00
SupportingFiles	Add support for Apple context menus in matrix items list screens (#5963)	2022-04-04 20:07:06 +02:00
Utils	5858: Move file on the right target	2022-04-01 17:06:26 +02:00
Common.xcconfig	Improve the Obj-C Generated Interface Header Name definition	2021-10-26 17:42:33 +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	Rename NOTIFICATION key to Notification for missing translations.	2022-04-08 14:14:34 +01:00