Gil Eluard ef234981a5 Merge branch 'gil/4494_space_menu' into gil/4501_show_suggested_in_room_lists ... # Conflicts: # Riot/Modules/Common/Recents/DataSources/RecentsDataSource.m		2021-08-03 22:07:45 +02:00
..
Assets	Merge branch 'gil/4494_space_menu' into gil/4501_show_suggested_in_room_lists	2021-08-03 22:07:45 +02:00
Categories	[Spaces] Show suggested in room lists #4501	2021-07-29 23:24:34 +02:00
Coordinators	Fix class keyword deprecation warnings everywhere!	2021-07-09 17:05:43 +01:00
Generated	Merge branch 'gil/4494_space_menu' into gil/4501_show_suggested_in_room_lists	2021-08-03 22:07:45 +02:00
Managers	Merge branch 'develop' into element_4090	2021-07-22 14:16:35 +02:00
Model	[Spaces] Show suggested in room lists #4501	2021-08-03 13:45:22 +02:00
Modules	Merge branch 'gil/4494_space_menu' into gil/4501_show_suggested_in_room_lists	2021-08-03 22:07:45 +02:00
Routers	Fix class keyword deprecation warnings everywhere!	2021-07-09 17:05:43 +01:00
SupportingFiles	SSOAuthenticationService: Handle login callback URL with HTML entities.	2021-06-28 16:49:05 +02:00
Utils	#4090 - Update after review	2021-07-06 23:03:56 +02:00
Common.xcconfig	XcodeGen: Use same names for yml and xcconfig files in every target	2021-02-11 09:21:00 +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 pull request #4379 from vector-im/manu/more_languages	2021-06-03 10:41:03 +02:00