Merge branch 'master' into patch-2

travis-ci · Jul 26, 2017 · 6b6478d · 6b6478d
2 parents ec937e8 + 8cf9b23
commit 6b6478d
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,8 +6,12 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ### Added
 
+- Code of Conduct
+
 ### Changed
 
+- `1.8` and `1.9` are now build-from-source bootstrapping candidates
+
 ### Deprecated
 
 ### Removed