diff options
author | Lauri Ojansivu <x@xet7.org> | 2018-05-24 14:08:44 +0300 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2018-05-24 14:08:44 +0300 |
commit | edae64b1c7f1b1f2022fc0294a995bea2019c537 (patch) | |
tree | 1a63c60d5701f7e9efe97ae5537406fd3e2e50a2 | |
parent | 171d0c862999788cf97f01fe4c3057b2f281f621 (diff) | |
parent | 9242bdb10b90eaf1847cd462a9882d6eceb3e94f (diff) | |
download | wekan-edae64b1c7f1b1f2022fc0294a995bea2019c537.tar.gz wekan-edae64b1c7f1b1f2022fc0294a995bea2019c537.tar.bz2 wekan-edae64b1c7f1b1f2022fc0294a995bea2019c537.zip |
Merge branch 'devel'
-rw-r--r-- | CHANGELOG.md | 8 | ||||
-rw-r--r-- | package.json | 2 |
2 files changed, 1 insertions, 9 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index ac833674..6698a16a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,11 +1,3 @@ -# 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 92dec31e..06b831da 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": "^1.0.0" + "xss": "^0.3.8" } } |