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

Conflicts:
	Vector/Categories/MXKRoomBubbleTableViewCell+Vector.m
This commit is contained in:
manuroe
2016-02-08 11:17:56 +01:00
3 changed files with 17 additions and 12 deletions
@@ -654,6 +654,11 @@
return cell;
}
- (void)tableView:(UITableView*)tableView commitEditingStyle:(UITableViewCellEditingStyle)editingStyle forRowAtIndexPath:(NSIndexPath*)indexPath
{
// iOS8 requires this method to enable editing (see editActionsForRowAtIndexPath).
}
#pragma mark - UITableView delegate
- (CGFloat)tableView:(UITableView *)tableView heightForHeaderInSection:(NSInteger)section