diff options
author | Lauri Ojansivu <x@xet7.org> | 2018-05-24 10:55:39 +0300 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2018-05-24 10:55:39 +0300 |
commit | 31e4400c667074fbc8644f8c3d89698dfeb96215 (patch) | |
tree | 75dcbe4e4f1f6af100fc0298376b49674a7fe510 | |
parent | 05020241aa564cb42f6ddf619a34455087cc6ee7 (diff) | |
parent | 3bcd578fcbf4b852ee34d3d33c43e3097ab45313 (diff) | |
download | wekan-31e4400c667074fbc8644f8c3d89698dfeb96215.tar.gz wekan-31e4400c667074fbc8644f8c3d89698dfeb96215.tar.bz2 wekan-31e4400c667074fbc8644f8c3d89698dfeb96215.zip |
Merge branch 'devel'
-rw-r--r-- | CHANGELOG.md | 8 | ||||
-rw-r--r-- | package.json | 2 |
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" } } |