From 3502b44178ec28431f93853ac2d32fec91c61cf4 Mon Sep 17 00:00:00 2001
From: Maxime Thirouin <m@moox.io>
Date: Fri, 25 Aug 2017 09:57:03 +0200
Subject: [PATCH] 0.21.2

---
 .gitignore   | 7 +++++++
 CHANGELOG.md | 5 +++++
 package.json | 4 ++--
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5e5b5337d..a5b38549e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,10 @@ test-setup
 
 # logo
 logo/*.png
+
+# lazy us: 1.0 is changing all of this
+examples/*
+package-lock.json
+*.log
+docs/public/*
+.merlin
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fbd090b5c..f1cf1ad44 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+# 0.21.2 - 2017-08-25
+
+- Fixed: fix for bad unicode characters in the markdown and `JSON.stringify`
+  ([#1128](https://github.com/MoOx/phenomic/pull/1128) - @revolunet)
+  
 # 0.21.1 - 2017-04-18
 
 - Fixed: hot reload for markdown files on Windows
diff --git a/package.json b/package.json
index 2bd5daa04..300126e5a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "phenomic",
-  "version": "0.21.1",
+  "version": "0.21.2",
   "description": "Modern website generator based on the React and Webpack ecosystem.",
   "keywords": [
     "webpack",
@@ -39,7 +39,7 @@
   "engines": {
     "node": ">=4.2.0",
     "npm": ">=3.0.0",
-    "yarn": ">=0.16.0"
+    "yarn": ">=0.16.0 || >=1.0.0-0"
   },
   "dependencies": {
     "babel-polyfill": "^6.5.0",