You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@couchdb.apache.org by wo...@apache.org on 2018/07/24 07:26:20 UTC

[couchdb] 01/01: Merge branch 'master' into bump-fauxton

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

wohali pushed a commit to branch bump-fauxton
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 6bce55bfcac88db93a3830b42ccc0ce5806e0efe
Merge: 6936d9e 98eec31
Author: Joan Touzet <wo...@users.noreply.github.com>
AuthorDate: Tue Jul 24 03:26:17 2018 -0400

    Merge branch 'master' into bump-fauxton

 rel/overlay/etc/default.ini                        | 9 ++++-----
 src/couch_replicator/src/couch_replicator_auth.erl | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)