From 40dbe72c48e1d321b62e1c6f0832152800bf3e18 Mon Sep 17 00:00:00 2001
From: Janek Bevendorff <janek@jbev.net>
Date: Sun, 29 Jul 2018 13:26:01 +0200
Subject: [PATCH] Update changelog and increase version to 1.2.0

---
 CHANGELOG                       | 10 ++++++++++
 keepassxc-browser/manifest.json |  3 +--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 8b52766..7cd8353 100755
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,13 @@
+1.2.0 (29-07-2018)
+=========================
+- Replace "Ignored Sites" with new "Site Preferences" settings page [#208]
+- Fix checks throwing errors [#207, #222]
+- Ignore more non-input elements [#212, 210]
+- Fix URL matching when there is a trailing slash [#231]
+- Allow infiting waiting on "Remember Credentials" popup [#232]
+- Minor user interface adjustments [#233, #230, #213]
+- Improve search field detection [#195]
+
 1.1.7 (13-06-2018)
 =========================
 - Fix credential field detection regression [#199]
diff --git a/keepassxc-browser/manifest.json b/keepassxc-browser/manifest.json
index 093266e..a571d1b 100755
--- a/keepassxc-browser/manifest.json
+++ b/keepassxc-browser/manifest.json
@@ -1,8 +1,7 @@
 {
 	"manifest_version": 2,
 	"name": "KeePassXC-Browser",
-	"version": "1.1.7",
-	"version_name": "1.1.7",
+	"version": "1.2.0",
 	"description": "KeePassXC integration for modern web browsers",
 	"author": "KeePassXC Team",
 	"icons": {