Merge branches 'bp/reset-quiet' and 'js/mingw-http-ssl' into nd/config-split

diff --git a/.gitignore b/.gitignore
index 87a28b3115f1412b3ad3a202c97cafd91dc7a8ee..64b3377d40c35a68a10d5f9e3aa6f3a6fa6aece2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 /fuzz_corpora
 /fuzz-pack-headers
+/fuzz-pack-idx
 /GIT-BUILD-OPTIONS
 /GIT-CFLAGS
 /GIT-LDFLAGS