daxi20/AdGuardHome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into fix/542

Browse Source
This commit is contained in:
Aleksey Dmitrevskiy
2019-02-27 18:47:01 +03:00
parent a9839e95a0 9a6266588d
commit ffa4429818
24 changed files with 161 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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"
)