From 0520fe2b2d9b3fbb04909d3ab303a7271e81e949 Mon Sep 17 00:00:00 2001
From: Roman Hotsiy <gotsijroman@gmail.com>
Date: Mon, 26 Feb 2018 15:43:35 +0200
Subject: [PATCH] =?UTF-8?q?chore:=20release=20v1.21.2=20=F0=9F=94=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 CHANGELOG.md | 10 ++++++++++
 package.json |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 086bed0b..42a18ec9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+<a name="1.21.2"></a>
+## [1.21.2](https://github.com/Rebilly/ReDoc/compare/v1.21.1...v1.21.2) (2018-02-26)
+
+
+### Bug Fixes
+
+* missing properties when using complex allOf (regression) ([6ce9245](https://github.com/Rebilly/ReDoc/commit/6ce9245)), closes [#422](https://github.com/Rebilly/ReDoc/issues/422)
+
+
+
 <a name="1.21.1"></a>
 ## [1.21.1](https://github.com/Rebilly/ReDoc/compare/v1.21.0...v1.21.1) (2018-02-23)
 
diff --git a/package.json b/package.json
index de27dde2..6548a70c 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "redoc",
   "description": "Swagger-generated API Reference Documentation",
-  "version": "1.21.1",
+  "version": "1.21.2",
   "repository": {
     "type": "git",
     "url": "git://github.com/Rebilly/ReDoc"