summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2018-05-24 10:55:12 +0300
committerLauri Ojansivu <x@xet7.org>2018-05-24 10:55:12 +0300
commit3bcd578fcbf4b852ee34d3d33c43e3097ab45313 (patch)
tree75dcbe4e4f1f6af100fc0298376b49674a7fe510
parentb9c63a8c8f6524477d42816a54fe108f1efccd1d (diff)
parent4c5daf5d85e6cf11ca167820fa7d93b682a5fd0f (diff)
downloadwekan-3bcd578fcbf4b852ee34d3d33c43e3097ab45313.tar.gz
wekan-3bcd578fcbf4b852ee34d3d33c43e3097ab45313.tar.bz2
wekan-3bcd578fcbf4b852ee34d3d33c43e3097ab45313.zip
Merge branch 'greenkeeper/xss-1.0.0' into devel
-rw-r--r--CHANGELOG.md8
-rw-r--r--package.json2
2 files changed, 9 insertions, 1 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6698a16a..ac833674 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,11 @@
+# Upcoming Wekan release
+
+This release adds the following new features:
+
+* [Update xss to version 1.00](https://github.com/wekan/wekan/commit/5b4d75a976244652d3c86e6d46c23d7c11e9ae8e).
+
+Thanks to GitHub user xet7 for contributions.
+
# v1.01 2018-05-23 Wekan release
This release possibly fixes the following bugs, please test:
diff --git a/package.json b/package.json
index 06b831da..92dec31e 100644
--- a/package.json
+++ b/package.json
@@ -29,6 +29,6 @@
"es6-promise": "^4.2.4",
"meteor-node-stubs": "^0.4.1",
"os": "^0.1.1",
- "xss": "^0.3.8"
+ "xss": "^1.0.0"
}
}