From a32962830e8a99e3fbf9c29f586bc325a001af35 Mon Sep 17 00:00:00 2001
From: Rodney Lorrimar <dev@rodney.id.au>
Date: Fri, 15 Jun 2018 05:17:27 +0800
Subject: [PATCH] Update ChangeLog for 1.2.1 (#3087)

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61d85387a8c..565268d5cf7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # CHANGELOG
 
+## Cardano SL 1.2.1 (Mainnet)
+
+Bug fix release.
+
+- The wallet launcher now uses a lock file. This prevents problems on
+  Windows if upgrading Daedalus while the old version is still
+  running. (DEVOPS-872)
+
+- Fix character encoding error in the connect script of the Docker
+  image. (DEVOPS-877)
+
+
 ## Cardano SL 1.2.0 (Mainnet)
 
 These are the most important code changes which were included in release 1.2.0.