From 0b4675039c036e541f2c24a312689456e773e8db Mon Sep 17 00:00:00 2001
From: Marcin Rataj <lidel@lidel.org>
Date: Tue, 30 Oct 2018 17:55:34 +0100
Subject: [PATCH 1/5] fix: pin.ls ignored opts when hash was present (#875)

Solves problem described in
https://github.com/ipfs-shipyard/ipfs-companion/issues/360#issuecomment-427525801

License: MIT
Signed-off-by: Marcin Rataj <lidel@lidel.org>
---
 src/pin/ls.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/pin/ls.js b/src/pin/ls.js
index 91db49f15..6348dfe89 100644
--- a/src/pin/ls.js
+++ b/src/pin/ls.js
@@ -12,14 +12,12 @@ module.exports = (send) => {
     }
     if (typeof opts === 'function') {
       callback = opts
+      opts = null
     }
     if (hash && hash.type) {
       opts = hash
       hash = null
-    } else {
-      opts = null
     }
-
     send({
       path: 'pin/ls',
       args: hash,

From a8f37d6e96c1ff2a9fbd50e45be404967e92d0d4 Mon Sep 17 00:00:00 2001
From: David Dias <daviddias.p@gmail.com>
Date: Tue, 30 Oct 2018 20:17:57 +0000
Subject: [PATCH 2/5] chore: update contributors

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4a6e79c40..20eca1806 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ipfs-api",
-  "version": "26.0.0",
+  "version": "26.0.1",
   "description": "A client library for the IPFS HTTP API",
   "leadMaintainer": "Alan Shaw <alan@tableflip.io>",
   "main": "src/index.js",

From ddf8beef20989cfb7ce053a8f7591e03e64b9e13 Mon Sep 17 00:00:00 2001
From: David Dias <daviddias.p@gmail.com>
Date: Tue, 30 Oct 2018 20:17:57 +0000
Subject: [PATCH 3/5] chore: release version v26.0.1

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 87ac8177a..594111be4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,8 @@
+<a name="26.0.1"></a>
+## [26.0.1](https://github.com/ipfs/js-ipfs-api/compare/v26.0.0...v26.0.1) (2018-10-30)
+
+
+
 <a name="26.0.0"></a>
 # [26.0.0](https://github.com/ipfs/js-ipfs-api/compare/v25.0.0...v26.0.0) (2018-10-30)
 

From 75e0771e96cac0f4a3d58cc589b23cc5406ddbc3 Mon Sep 17 00:00:00 2001
From: David Dias <daviddias.p@gmail.com>
Date: Wed, 31 Oct 2018 06:35:19 +0000
Subject: [PATCH 4/5] chore: update contributors

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 20eca1806..e04512930 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ipfs-api",
-  "version": "26.0.1",
+  "version": "26.0.2",
   "description": "A client library for the IPFS HTTP API",
   "leadMaintainer": "Alan Shaw <alan@tableflip.io>",
   "main": "src/index.js",

From 7fb2cff60fad15e3e66ff931f27935f17f50cf2e Mon Sep 17 00:00:00 2001
From: David Dias <daviddias.p@gmail.com>
Date: Wed, 31 Oct 2018 06:35:19 +0000
Subject: [PATCH 5/5] chore: release version v26.0.2

---
 CHANGELOG.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 594111be4..6b1d5c2df 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+<a name="26.0.2"></a>
+## [26.0.2](https://github.com/ipfs/js-ipfs-api/compare/v26.0.0...v26.0.2) (2018-10-31)
+
+
+### Bug Fixes
+
+* pin.ls ignored opts when hash was present ([#875](https://github.com/ipfs/js-ipfs-api/issues/875)) ([0b46750](https://github.com/ipfs/js-ipfs-api/commit/0b46750)), closes [/github.com/ipfs-shipyard/ipfs-companion/issues/360#issuecomment-427525801](https://github.com//github.com/ipfs-shipyard/ipfs-companion/issues/360/issues/issuecomment-427525801)
+
+
+
 <a name="26.0.1"></a>
 ## [26.0.1](https://github.com/ipfs/js-ipfs-api/compare/v26.0.0...v26.0.1) (2018-10-30)