diff options
| author | David Bremner <david@tethera.net> | 2017-12-31 09:26:13 -0400 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2017-12-31 09:26:13 -0400 |
| commit | 99407db25cbd44f915fb33708c497bc375ff63de (patch) | |
| tree | 2b357c6cb01ac5ec9ce2e262077184c9f7a7b075 /version | |
| parent | e5e252de5560fee386bd46f8f279c800b953c667 (diff) | |
| parent | eff029de4a8782ccfe20e26814c740a271cb5285 (diff) | |
Merge branch 'release'
Conflicts:
doc/man1/notmuch-reply.rst
doc/man1/notmuch-show.rst
Conflicts taken from release (dkg's doc changes)
Diffstat (limited to 'version')
| -rw-r--r-- | version | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -1 +1 @@ -0.26~rc0 +0.26~rc1 |