Updated CHANGELOG for 3.6.13

conda-forge · Mar 19, 2020 · b4b86f1 · b4b86f1
1 parent 7cca998
commit b4b86f1
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 118 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -4,6 +4,29 @@ conda-smithy Change Log
 
 .. current developments
 
+v3.6.13
+====================
+
+**Added:**
+
+* Added code to validate feedstock tokens
+* Added code to register FEEDSTOCK_TOKENS per CFEP-13
+* Linter will now recommend SPDX expression for license entry
+
+**Fixed:**
+
+* Rerender use forge_config["recipe_dir"] instead of hardcoding "recipe" (#1254 & #1257)
+* Fixed bug where BINSTAR_TOKEN's were not properly patched if they already
+  existed for TravisCI.
+
+**Authors:**
+
+* Isuru Fernando
+* Matthew R Becker
+* Tim Snyder
+
+
+
 v3.6.12
 ====================
 

diff --git a/news/1254_rerender_missing_recipe_dir_from_config.rst b/news/1254_rerender_missing_recipe_dir_from_config.rst
diff --git a/news/cfep-13-2.rst b/news/cfep-13-2.rst
diff --git a/news/cfep-13.rst b/news/cfep-13.rst
diff --git a/news/license_spdx.rst b/news/license_spdx.rst
diff --git a/news/travis_ci.rst b/news/travis_ci.rst