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

Posted to commits@couchdb.apache.org by ja...@apache.org on 2016/04/25 21:26:03 UTC

[3/3] chttpd commit: updated refs/heads/master to 0a3abea

Merge branch 'fix-users-doc-in-conflict'

* fix-users-doc-in-conflict:
  restore 1.x behaviour: user docs in conflict cannot login


Project: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/commit/0a3abeaa
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/tree/0a3abeaa
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-chttpd/diff/0a3abeaa

Branch: refs/heads/master
Commit: 0a3abeaa60e1df4d0e168ea63b054114c500dd1a
Parents: 7ebddaf 9100e32
Author: Jan Lehnardt <ja...@apache.org>
Authored: Mon Apr 25 21:25:41 2016 +0200
Committer: Jan Lehnardt <ja...@apache.org>
Committed: Mon Apr 25 21:25:41 2016 +0200

----------------------------------------------------------------------

----------------------------------------------------------------------