mirror of
https://github.com/vector-im/element-ios.git
synced 2024-09-30 00:02:47 +00:00
d90423e78a
# Conflicts: # Riot/Categories/MXRoom+Riot.m # Riot/Model/RoomList/RecentCellData.m |
||
---|---|---|
.. | ||
MXKRoomBubbleTableViewCell+Riot.h | ||
MXKRoomBubbleTableViewCell+Riot.m | ||
MXRoom+Riot.h | ||
MXRoom+Riot.m | ||
UINavigationController+Riot.h | ||
UINavigationController+Riot.m | ||
UIViewController+RiotSearch.h | ||
UIViewController+RiotSearch.m |