Commit graph

2 commits

Author SHA1 Message Date
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
Gil Eluard
99caa08860 [Spaces] M10.7 Explore rooms #4571
- Update after review
2021-09-01 18:12:08 +03:00
Renamed from Riot/Modules/Spaces/SpaceRoomList/SpaceChildRoomDetail/ShowSpaceChildRoomDetailViewModel.swift (Browse further)