Commit graph

2 commits

Author SHA1 Message Date
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
giomfo
7c6057bfed Chat screen: Update bubble layout
-Define all required cell view classes
-Disable timestamp display (TODO display timestamp for last message, and selected message if any).
2015-12-08 10:10:59 +01:00