]> git.notmuchmail.org Git - notmuch/commitdiff
Merge branch 'release'
authorDavid Bremner <david@tethera.net>
Sun, 31 Dec 2017 13:26:13 +0000 (09:26 -0400)
committerDavid Bremner <david@tethera.net>
Sun, 31 Dec 2017 13:26:13 +0000 (09:26 -0400)
Conflicts:
        doc/man1/notmuch-reply.rst
doc/man1/notmuch-show.rst

Conflicts taken from release (dkg's doc changes)


No differences found