[couchdb-nano] 04/08: Merge branch 'master' of github.com:apache/couchdb-nano

[glynnbird]

This is an automated email from the ASF dual-hosted git repository.

glynnbird pushed a commit to branch standard
in repository https://gitbox.apache.org/repos/asf/couchdb-nano.git

commit 28acda412d0c00853280c55f343f7e9d16889f4f
Merge: f5f30b6 2263f3c
Author: Glynn Bird <glynn.b...@gmail.com>
AuthorDate: Tue Aug 14 14:35:26 2018 +0100

    Merge branch 'master' of github.com:apache/couchdb-nano

 package.json                 | 3 +--
 tests/helpers/integration.js | 5 ++---
 2 files changed, 3 insertions(+), 5 deletions(-)