]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jk/no-openssl-with-openssl-sha1'
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 Sep 2024 18:16:30 +0000 (11:16 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Sep 2024 18:16:31 +0000 (11:16 -0700)
The "imap-send" now allows to be compiled with NO_OPENSSL and
OPENSSL_SHA1 defined together.

* jk/no-openssl-with-openssl-sha1:
  imap-send: handle NO_OPENSSL even when openssl exists

1  2 
imap-send.c

diff --cc imap-send.c
Simple merge