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
..
SpaceMenuCell.swift	[Spaces] M10.4.1 Home space data filtering #4570	2021-10-18 15:01:11 +02:00
SpaceMenuListItemViewData.swift	Space panel overflow journeys & rough edge warnings #5227	2021-12-10 18:01:56 +01:00
SpaceMenuListViewCell.swift	Space panel overflow journeys & rough edge warnings #5227	2021-12-10 18:01:56 +01:00
SpaceMenuListViewCell.xib	Space panel overflow journeys & rough edge warnings #5227	2021-12-10 18:01:56 +01:00
SpaceMenuPresenter.swift	Space panel overflow journeys & rough edge warnings #5227	2021-12-10 18:01:56 +01:00
SpaceMenuSwitchViewCell.swift	[Spaces] M10.4.1 Home space data filtering #4570	2021-10-18 15:01:11 +02:00
SpaceMenuSwitchViewCell.xib	[Spaces] M10.4.1 Home space data filtering #4570	2021-10-07 15:37:20 +02:00
SpaceMenuViewAction.swift	[spaces] several fixes for pre release	2021-09-23 14:50:00 +02:00
SpaceMenuViewController.storyboard	[Spaces] M10.9 Space menu #4494	2021-08-12 11:23:47 +02:00
SpaceMenuViewController.swift	Merge branch 'develop' into gil/SP1_space_creation	2022-03-08 11:23:55 +01:00
SpaceMenuViewModel.swift	Space panel overflow journeys & rough edge warnings #5227	2021-12-10 18:01:56 +01:00
SpaceMenuViewModelType.swift	[Spaces] M10.4.1 Home space data filtering #4570	2021-10-18 16:44:55 +02:00
SpaceMenuViewState.swift	[Spaces] M10.4.1 Home space data filtering #4570	2021-10-11 09:52:21 +02:00