Merge branch 'dk/format-patch-ignore-diff-submodule'

diff --git a/t/lib-httpd/apache.conf b/t/lib-httpd/apache.conf
index 7713dd260948c0fca0c0633b6c2cc152f7bc1361..03a4c2ee842e51e13b14774f1f86a4e7b22ae10c 100644 (file)
--- a/t/lib-httpd/apache.conf
+++ b/t/lib-httpd/apache.conf
@@ -69,6 +69,7 @@ LockFile accept.lock
 PassEnv GIT_VALGRIND
 PassEnv GIT_VALGRIND_OPTIONS
 PassEnv GNUPGHOME
+PassEnv ASAN_OPTIONS
 
 Alias /dumb/ www/
 Alias /auth/dumb/ www/auth/dumb/