Merge branch 'release-candidate' into stable

material-foundation · Dec 22, 2017 · 81f26ee · 81f26ee
2 parents da60fc6 + 2f366d5
commit 81f26ee
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# 2.4.1
+
+ Add `exampleRelatedInfo` to the CBCNode header for external invocation.
+
+ ## Source changes
+
+ * [add exampleRelatedInfo to header file (#26)](https://github.com/material-foundation/cocoapods-catalog-by-convention/commit/57edd7f16ea7ec40d62378faacbc95071310bfbc) (Yarden Eitan)
+
 # 2.4.0
 
 - Now you can add the method `catalogRelatedInfo` that returns an NSURL to your example, if you wish to link to related information and resources.

diff --git a/CatalogByConvention.podspec b/CatalogByConvention.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "CatalogByConvention"
-  s.version      = "2.4.0"
+  s.version      = "2.4.1"
   s.authors      = "Google Inc."
   s.summary      = "Tools for building a Catalog by Convention."
   s.homepage     = "https://github.com/material-foundation/cocoapods-catalog-by-convention"

diff --git a/src/CBCNodeListViewController.h b/src/CBCNodeListViewController.h
@@ -113,4 +113,7 @@ FOUNDATION_EXTERN CBCNode *_Nonnull CBCCreatePresentableNavigationTree(void);
  */
 - (nonnull NSString *)exampleDescription;
 
+/** Returns a link to related information for the example. */
+- (nullable NSURL *)exampleRelatedInfo;
+
 @end