Merge pull request #3316 from ether/release/1.6.3

Release version 1.6.3

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

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"
 }