This is an automated email from the ASF dual-hosted git repository. jan pushed a commit to branch fix/prox in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 073297bc9974e8462b2a30064da34cf46c99006c Merge: 160b8fd 572234f Author: Jan Lehnardt <[email protected]> AuthorDate: Fri Jul 13 17:18:45 2018 +0200 Merge branch 'master' into fix/prox src/mango/src/mango_cursor_view.erl | 8 ++++---- src/mango/test/19-find-conflicts.py | 41 +++++++++++++++++++++++++++++++++++++ src/mango/test/mango.py | 5 +++++ 3 files changed, 50 insertions(+), 4 deletions(-)
