From 6b3ae68badcc49a9477e080337bcbfe3d1ac9036 Mon Sep 17 00:00:00 2001
From: Fazouane Marouane <fazouanem3@gmail.com>
Date: Wed, 15 Feb 2017 05:55:38 +0100
Subject: [PATCH] release 1.2.0

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a0ebe1..6ea8293 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## 1.2.0
+
+* Support for `line-height` with value `normal`
+* A new option has been created to explicitely treat `line-height` as a fixed value (not relative to the current `font-size`).
+* Refactoring of the code
+
 ## 1.1.1
 
 * Floor the optimal `font-size` to avoid rounding errors. Thanks to @Robinfr for PR #2.
diff --git a/package.json b/package.json
index b3a855c..1e476ed 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fancy-textfill",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "Fast implementation for resizing text to fill its container.",
   "main": "index.js",
   "repository": "https://github.com/fazouane-marouane/fancy-textfill",