Gil Eluard f423795d94 Merge branch 'spaces' into gil/4497_space_preview_bottom_sheet ... # Conflicts: # Riot/Modules/SideMenu/SideMenuCoordinator.swift		2021-09-14 17:53:46 +02:00
..
Assets	[Spaces] M10.6 Space preview bottom sheet #4497	2021-09-14 09:42:10 +02:00
Categories	[Spaces] M10.7 Explore rooms #4571	2021-09-01 18:12:08 +03:00
Coordinators	Fix class keyword deprecation warnings everywhere!	2021-07-09 17:05:43 +01:00
Generated	[Spaces] M10.6 Space preview bottom sheet #4497	2021-09-14 09:42:10 +02:00
Managers	[Spaces] M10.8 Browsing users in a space #4682	2021-09-14 16:59:32 +02:00
Model	[Spaces] Show suggested in room lists #4501	2021-08-03 13:45:22 +02:00
Modules	Merge branch 'spaces' into gil/4497_space_preview_bottom_sheet	2021-09-14 17:53:46 +02:00
Routers	Fix class keyword deprecation warnings everywhere!	2021-07-09 17:05:43 +01:00
SupportingFiles	[Spaces] M10.8 Browsing users in a space #4682	2021-08-22 08:48:54 +03: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