Merge branch 'master' into 1.5-dev

# Conflicts: # Classes/UITableView+FDTemplateLayoutCell.m
forkingdog · Mar 16, 2016 · 66ea4a4 · 66ea4a4
2 parents 8724a06 + 99d7682
commit 66ea4a4
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/Classes/UITableView+FDTemplateLayoutCell.m b/Classes/UITableView+FDTemplateLayoutCell.m
@@ -127,7 +127,7 @@ - (CGFloat)fd_heightForCellWithIdentifier:(NSString *)identifier configuration:(
 
     UITableViewCell *templateLayoutCell = [self fd_templateCellForReuseIdentifier:identifier];
 
-    // Manually calls to ensure consistent behavior with actual cells (that are displayed on screen).
+    // Manually calls to ensure consistent behavior with actual cells. (that are displayed on screen)
     [templateLayoutCell prepareForReuse];
 
     // Customize and provide content for our template cell.