diff options
author | Benjamin Neff <benjamin@coding4coffee.ch> | 2018-02-09 00:55:30 +0300 |
---|---|---|
committer | Benjamin Neff <benjamin@coding4coffee.ch> | 2018-02-09 00:55:30 +0300 |
commit | a8fcbb3365de007eb75e38d88c0dd94309c6b68e (patch) | |
tree | 46b55792fb69e3201ceef95d9fb0f3c3f1ee9bbf /Changelog.md | |
parent | 7abb0518e9e05093e8b5cc45bc705a0d6d58cb52 (diff) | |
parent | 1f3ad2fa659952ea84c70fd56cd9f2a967291690 (diff) |
Merge branch 'master' into next-minor
Diffstat (limited to 'Changelog.md')
-rw-r--r-- | Changelog.md | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Changelog.md b/Changelog.md index 9a3c683b3..9706d885c 100644 --- a/Changelog.md +++ b/Changelog.md @@ -21,6 +21,7 @@ * Fix the mobile bookmarklet when called without parameters [#7698](https://github.com/diaspora/diaspora/pull/7698) * Properly build the #newhere message for people who got invited [#7702](https://github.com/diaspora/diaspora/pull/7702) * Fix the admin report view for posts without text [#7706](https://github.com/diaspora/diaspora/pull/7706) +* Upgrade Nokogiri to fix [a disclosed vulnerability in libxml2](https://github.com/sparklemotion/nokogiri/issues/1714) ## Features * Check if redis is running in script/server [#7685](https://github.com/diaspora/diaspora/pull/7685) |