Merge branch 'develop' into my-develop

This commit is contained in:
Jim Hague 2020-03-04 15:30:47 +00:00
commit 37e33bc7f5
2 changed files with 3 additions and 3 deletions

4
.gitmodules vendored
View File

@ -12,5 +12,5 @@
branch = develop
[submodule "src/ssl_dane"]
path = src/ssl_dane
url = https://github.com/banburybill/ssl_dane
branch = feature/windows-native-build
url = https://github.com/getdnsapi/ssl_dane
branch = getdns

@ -1 +1 @@
Subproject commit 187838104f3cfc9634148ae41a717e00c0d68e67
Subproject commit afd5b88687f05554513d9caf000f08904e32e6a4