From 4c0f5d5263af3e878504e4a8be9f197e5d6a1dd3 Mon Sep 17 00:00:00 2001
From: Brent Jackson <jxnblk@gmail.com>
Date: Tue, 31 Jul 2018 19:41:24 -0400
Subject: [PATCH] Edit changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ff53d0e..51deea5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 
 # Changelog
 
+## v1.2.1 2018-07-31
+
+- Merge custom components with defaults
+
 ## v1.2.0 2018-07-31
 
 - Add PDF export to CLI