diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2014-08-20 20:34:17 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2014-08-20 20:36:25 +0100 |
| commit | 83b2729321db62e758a300e372b2dd74e527d004 (patch) | |
| tree | 53f73aee926e53f1c203366b086052e5b0dd90df /doc/doc-txt/experimental-spec.txt | |
| parent | a1bccd48f3956b50a13a34f5aed4b72c658c61af (diff) | |
Merge branch dane-tpda into dane
Conflicts:
doc/doc-txt/experimental-spec.txt
src/src/deliver.c
src/src/functions.h
src/src/smtp_out.c
src/src/tls-openssl.c
src/src/transports/smtp.c
src/src/verify.c
Diffstat (limited to 'doc/doc-txt/experimental-spec.txt')
0 files changed, 0 insertions, 0 deletions