element-ios/Vector/Utils
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
..
AvatarGenerator.h display_room_avatars 2015-12-04 14:28:15 +01:00
AvatarGenerator.m Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00
EventFormatter.h RoomBubbleTableViewCell: show/hide message timestamp 2015-08-25 11:19:49 +02:00
EventFormatter.m Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00
VectorDesignValues.h Merge remote-tracking branch 'origin/develop' into public_rooms_search 2015-12-21 10:35:48 +01:00