element-ios/Vector/Views
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
..
Authentication Authentication: prepare C-S auth API v2 support 2015-09-28 10:23:33 +02:00
RoomActivitiesView RoomInputToolbar: Remove useless items 2015-12-04 16:06:11 +01:00
RoomBubbleList Fix compilation issue after ios matrix kit update. 2015-12-01 19:21:55 +01:00
RoomInputToolbar RoomInputToolbar: Remove useless items 2015-12-04 16:06:11 +01:00
RoomList display_room_avatars : 2015-12-03 16:21:57 +01:00
RoomTitle Add the green chevron aside the room name. 2015-11-30 14:34:12 +01:00
TableViewCell remove some unected committed files. 2015-11-23 18:00:48 +00:00