element-ios/Vector/Model
yannick 74de3eeb0f Merge remote-tracking branch 'origin/develop' into display_room_avatars
Conflicts:
	Vector/ViewController/RoomViewController.m
2015-12-04 16:43:11 +01:00
..
Contact display_room_avatars 2015-12-04 14:28:15 +01:00
Room Fix compilation issue after ios matrix kit update. 2015-12-01 19:21:55 +01:00
RoomList fav_recents_display 2015-12-04 09:02:02 +01:00