Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-29 07:42:40 +00:00
Code Issues Projects Releases Packages Wiki Activity
element-ios/Riot/Modules/TabBar
History
Gil Eluard 8ba6c55a87 Merge branch 'develop' into spaces 
# Conflicts:
#	Riot/Modules/Common/Avatar/AvatarViewDataProtocol.swift
#	Riot/Modules/Common/Recents/RecentsViewController.m
#	Riot/Modules/Home/Views/RoomCollectionViewCell.m
#	Riot/Modules/TabBar/TabBarCoordinator.swift
2021-09-15 14:42:04 +02:00
..
MainTitleView.swift [Spaces] Show spaces in left panel #4509 2021-08-02 09:57:30 +02:00
MasterTabBarController.h Merge branch 'spaces' into element_4509 2021-07-26 10:42:49 +02:00
MasterTabBarController.m Merge branch 'develop' into spaces 2021-09-15 14:42:04 +02:00
TabBarCoordinator.swift Merge branch 'develop' into spaces 2021-09-15 14:42:04 +02:00
TabBarCoordinatorType.swift Merge branch 'spaces' into element_4509 2021-07-26 10:42:49 +02:00