element-ios/Riot/Categories
manuroe d90423e78a Merge remote-tracking branch 'origin/develop' into room_summary
# Conflicts:
#	Riot/Categories/MXRoom+Riot.m
#	Riot/Model/RoomList/RecentCellData.m
2017-03-15 17:24:54 +01:00
..
MXKRoomBubbleTableViewCell+Riot.h Rebranding: replace Vector by Riot everywhere in the git and github repos 2017-03-09 11:25:36 +01:00
MXKRoomBubbleTableViewCell+Riot.m Rebranding: replace Vector by Riot everywhere in the git and github repos 2017-03-09 11:25:36 +01:00
MXRoom+Riot.h Rebranding: replace Vector by Riot everywhere in the git and github repos 2017-03-09 11:59:22 +01:00
MXRoom+Riot.m Merge remote-tracking branch 'origin/develop' into room_summary 2017-03-15 17:24:54 +01:00
UINavigationController+Riot.h Rebranding: replace Vector by Riot everywhere in the git and github repos 2017-03-09 11:59:22 +01:00
UINavigationController+Riot.m Rebranding: replace Vector by Riot everywhere in the git and github repos 2017-03-09 11:59:22 +01:00
UIViewController+RiotSearch.h Rebranding: replace Vector by Riot everywhere in the git and github repos 2017-03-09 11:59:22 +01:00
UIViewController+RiotSearch.m Rebranding: replace Vector by Riot everywhere in the git and github repos 2017-03-09 11:59:22 +01:00