Merge remote-tracking branch 'origin/develop' into add_invite_rooms_section

Conflicts:
	Vector/Views/RoomList/RecentTableViewCell.xib
This commit is contained in:
yannick
2015-12-10 13:52:20 +01:00
3 changed files with 30 additions and 24 deletions
+1 -1
View File
@@ -122,7 +122,7 @@
+ (CGFloat)heightForCellData:(MXKCellData *)cellData withMaximumWidth:(CGFloat)maxWidth
{
// The height is fixed
return 54;
return 74;
}
@end