Merge branch 'release-candidate'

material-components · Jun 8, 2016 · 5e75af6 · 5e75af6
2 parents ea1057d + e445cd7
commit 5e75af6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# 10.1.1
+
+### FontDiskLoader
+
+#### Changes
+
+* [Removed extra /x03 character in comment because it shouldn't be there.](https://github.com/google/material-components-ios/commit/b018eb87438ccfd4fa99850d9ed48698ff91e7e3) (randallli)
+
 # 10.1.0
 
 ## API diffs

diff --git a/components/FontDiskLoader/src/MDCFontDiskLoader.h b/components/FontDiskLoader/src/MDCFontDiskLoader.h
@@ -104,7 +104,7 @@
 /** A convience method for getting a font. */
 - (nullable UIFont *)fontOfSize:(CGFloat)fontSize;
 
-// TODO: On or after 6/8/2016 delete these deprecations
+// TODO: On or after 6/8/2016 delete these deprecations
 - (void)setIsRegistered:(BOOL)isRegistered __deprecated_msg("This setter is no longer public");
 - (void)setHasFailedRegistration:(BOOL)hasFailedRegistration __deprecated_msg("This setter is no longer public");