From 8933f1128d085dee7f4dbf020c295e3e9ac0962f Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Wed, 11 Apr 2018 20:28:50 +0100 Subject: [PATCH] Changelog entry and credit for #1165 --- docs/changelog.md | 4 ++++ docs/index.md | 2 ++ package.json | 5 +++-- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/docs/changelog.md b/docs/changelog.md index 735aa410..ef7e4c01 100644 --- a/docs/changelog.md +++ b/docs/changelog.md @@ -10,6 +10,10 @@ Requires libvips v8.6.1. [#825](https://github.com/lovell/sharp/pull/825) [@rikh42](https://github.com/rikh42) +* Add environment variable to ignore globally-installed libvips. + [#1165](https://github.com/lovell/sharp/pull/1165) + [@oncletom](https://github.com/oncletom) + #### v0.20.1 - 17th March 2018 * Improve installation experience when a globally-installed libvips below the minimum required version is found. diff --git a/docs/index.md b/docs/index.md index 75c027d9..ecaecec2 100644 --- a/docs/index.md +++ b/docs/index.md @@ -109,6 +109,8 @@ the help and code contributions of the following people: * [Oleh Aleinyk](https://github.com/oaleynik) * [Marcel Bretschneider](https://github.com/3epnm) * [Andrea Bianco](https://github.com/BiancoA) +* [Rik Heywood](https://github.com/rikh42) +* [Thomas Parisot](https://github.com/oncletom) Thank you! diff --git a/package.json b/package.json index c707801d..71e26260 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,8 @@ "Oleh Aleinyk ", "Marcel Bretschneider ", "Andrea Bianco ", - "Rik Heywood " + "Rik Heywood ", + "Thomas Parisot " ], "scripts": { "install": "(node install/libvips && node install/dll-copy && prebuild-install) || (node-gyp rebuild && node install/dll-copy)", @@ -92,7 +93,7 @@ "devDependencies": { "async": "^2.6.0", "cc": "^1.0.2", - "documentation": "^6.1.0", + "documentation": "^6.2.0", "exif-reader": "^1.0.2", "icc": "^1.0.0", "mocha": "^5.0.5",