Gil Eluard 996ef72498 Merge branch 'develop' into gil/SP1_space_creation ... # Conflicts: # Riot/Modules/Room/Members/RoomParticipantsViewController.m # Riot/Modules/Room/RoomViewController.m # Riot/Modules/Room/Settings/RoomSettingsViewController.h # Riot/Modules/Spaces/SpaceMembers/MemberList/SpaceMemberListViewController.swift		2022-03-08 11:23:55 +01:00
..
Assets	Merge branch 'develop' into gil/SP1_space_creation	2022-03-08 11:23:55 +01:00
Categories	Merge branch 'develop' into gil/SP1_space_creation	2022-03-01 10:15:13 +01:00
Coordinators	Fix class keyword deprecation warnings everywhere!	2021-07-09 17:05:43 +01:00
Generated	Merge branch 'develop' into gil/SP1_space_creation	2022-03-08 11:23:55 +01:00
Managers	Merge branch 'develop' into gil/SP1_space_creation	2022-03-08 11:23:55 +01:00
Model	vector-im/element-ios/issues/5298 - Add .well-known configuration support for tile server and map styles.	2022-02-04 11:33:55 +02:00
Modules	Merge branch 'develop' into gil/SP1_space_creation	2022-03-08 11:23:55 +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	Merge branch 'develop' into gil/SP1_space_creation	2022-03-04 13:38:18 +01:00
Utils	Use senderAvatarUrl instead of dictionnary	2022-03-07 13:45:02 +01: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	Add missing languages.	2022-03-07 12:10:16 +00:00