Merge branch 'master' into fix/596

This commit is contained in:
Aleksey Dmitrevskiy
2019-02-27 18:56:36 +03:00
24 changed files with 83 additions and 81 deletions

2
dns.go
View File

@@ -8,7 +8,7 @@ import (
"github.com/AdguardTeam/AdGuardHome/dnsfilter"
"github.com/AdguardTeam/AdGuardHome/dnsforward"
"github.com/AdguardTeam/dnsproxy/upstream"
"github.com/hmage/golibs/log"
"github.com/AdguardTeam/golibs/log"
"github.com/joomcode/errorx"
)