Merge remote-tracking branch 'origin/master' into dhcp6

# Conflicts:
#	openapi/openapi.yaml
This commit is contained in:
Simon Zolin
2020-05-29 14:28:18 +03:00
231 changed files with 17877 additions and 13625 deletions

4
go.mod
View File

@@ -3,9 +3,9 @@ module github.com/AdguardTeam/AdGuardHome
go 1.14
require (
github.com/AdguardTeam/dnsproxy v0.27.0
github.com/AdguardTeam/dnsproxy v0.28.1
github.com/AdguardTeam/golibs v0.4.2
github.com/AdguardTeam/urlfilter v0.10.0
github.com/AdguardTeam/urlfilter v0.10.1
github.com/NYTimes/gziphandler v1.1.1
github.com/fsnotify/fsnotify v1.4.7
github.com/gobuffalo/packr v1.30.1