Alfonso Grillo 455118d22b Merge branch 'develop' into alfogrillo/learn_more_sheet ... # Conflicts: # RiotSwiftUI/Modules/UserSessions/UserOtherSessions/UserOtherSessionsModels.swift # RiotSwiftUI/Modules/UserSessions/UserOtherSessions/UserOtherSessionsViewModel.swift # RiotSwiftUI/Modules/UserSessions/UserSessionOverview/UserSessionOverviewModels.swift # RiotSwiftUI/Modules/UserSessions/UserSessionOverview/UserSessionOverviewViewModel.swift # RiotSwiftUI/Modules/UserSessions/UserSessionOverview/View/UserSessionOverview.swift		2022-11-03 18:25:06 +01:00
..
Assets	Merge branch 'develop' into alfogrillo/learn_more_sheet	2022-11-03 18:25:06 +01:00
Categories	Curate MXCrypto protocol methods	2022-10-25 18:11:13 +01:00
Coordinators	Fix class keyword deprecation warnings everywhere!	2021-07-09 17:05:43 +01:00
Generated	Merge branch 'develop' into alfogrillo/learn_more_sheet	2022-11-03 18:25:06 +01:00
Managers	Refine settings logic	2022-11-03 14:47:08 +01:00
Model	Read tile server URL from .well-known (PSG-592)	2022-07-25 17:00:37 +02:00
Modules	Merge pull request #7027 from vector-im/mauroromito/6946_custom_emojis	2022-11-02 17:31:19 +01:00
PropertyWrappers	Fix compiler issue	2021-10-05 14:08:05 +03:00
Routers	The theme defined in the application is not applied to all UI components (#6532)	2022-08-05 15:00:22 +02:00
SupportingFiles	[Voice Broadcast] Aggregate the chunks of voice messages in room timeline (#6891)	2022-10-17 18:23:47 +02:00
Utils	Add device_id and record tag	2022-10-20 01:45:57 +02:00
Common.xcconfig	Stop using an ephemeral web browser session on SSO (#6464)	2022-07-27 12:13:31 +01: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	Merge branch 'develop' of github.com:vector-im/element-ios into langleyd/wysiwyg_integration	2022-10-08 10:58:10 +01:00