element-ios/Riot/Modules/TabBar
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
..
MainTitleView.swift [Spaces] Show spaces in left panel #4509 2021-08-02 09:57:30 +02:00
MasterTabBarController.h Prepare onboarding flow for personalisation screens. 2022-02-25 11:27:27 +00:00
MasterTabBarController.m Prepare onboarding flow for personalisation screens. 2022-02-25 11:27:27 +00:00
MasterTabBarItemDisplayProtocol.swift Use protocol to get title from child VCs. 2022-02-23 11:41:05 +00:00
TabBarCoordinator.swift Merge branch 'develop' into gil/SP1_space_creation 2022-03-08 11:23:55 +01:00
TabBarCoordinatorParameters.swift Move TabBarCoordinatorParameters. 2021-10-06 15:47:39 +02:00
TabBarCoordinatorType.swift Merge branch 'spaces' into element_4509 2021-07-26 10:42:49 +02:00