Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-30 00:02:47 +00:00
Code Issues Projects Releases Packages Wiki Activity
element-ios/Vector/Categories
History
manuroe 68fd187509 Merge remote-tracking branch 'origin/develop' into public_rooms_search 
Conflicts:
	Vector/Base.lproj/Main.storyboard
	Vector/Model/RoomList/RecentsDataSource.m
2015-12-21 10:35:48 +01:00
..
MXKRoomBubbleTableViewCell+Vector.h Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00
MXKRoomBubbleTableViewCell+Vector.m Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00
MXRoom+Vector.h Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00
MXRoom+Vector.m Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00