mirror of
https://github.com/vector-im/element-ios.git
synced 2024-10-01 16:52:40 +00:00
8ba6c55a87
# Conflicts: # Riot/Modules/Common/Avatar/AvatarViewDataProtocol.swift # Riot/Modules/Common/Recents/RecentsViewController.m # Riot/Modules/Home/Views/RoomCollectionViewCell.m # Riot/Modules/TabBar/TabBarCoordinator.swift |
||
---|---|---|
.. | ||
DirectorySectionHeaderContainerView.h | ||
DirectorySectionHeaderContainerView.m | ||
RecentTableViewCell.h | ||
RecentTableViewCell.m | ||
RecentTableViewCell.xib | ||
RootTabEmptyView.swift | ||
RootTabEmptyView.xib |