From 1e25e7fc773eb360b2fed52c39c3a14bc2a443ff Mon Sep 17 00:00:00 2001
From: Stefan <mu.stefan@googlemail.com>
Date: Sat, 3 Feb 2018 12:55:07 +0100
Subject: [PATCH] Release version 1.6.3

---
 CHANGELOG.md     | 8 ++++++++
 src/package.json | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a96b9b3c..74d06f45 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# 1.6.3
+ * SECURITY: Update ejs
+ * SECURITY: xss vulnerability when reading window.location.href
+ * SECURITY: sanitize jsonp
+ * NEW: Catch SIGTERM for graceful shutdown
+ * NEW: Show actual applied text formatting for caret position
+ * NEW: Add settings to improve scrolling of viewport on line changes
+
 # 1.6.2
  * NEW: Added pad shortcut disabling feature
  * NEW: Create option to automatically reconnect after a few seconds
diff --git a/src/package.json b/src/package.json
index 8f083890..a29c06e5 100644
--- a/src/package.json
+++ b/src/package.json
@@ -56,6 +56,6 @@
   "repository"     : { "type" : "git",
                        "url" : "http://github.com/ether/etherpad-lite.git"
                      },
-  "version"        : "1.6.2",
+  "version"        : "1.6.3",
   "license"        : "Apache-2.0"
 }