kenshinx 2e97278cb9 Merge https://github.com/bigeagle/godns into domain-specs-name-server ...

# Conflicts:
#	handler.go
#	hosts.go
#	hosts_test.go
#	resolver.go
#	settings.go

2018-02-01 15:39:47 +08:00

..

china.conf

Merge https://github.com/bigeagle/godns into domain-specs-name-server

2018-02-01 15:39:47 +08:00

godns.conf

Merge https://github.com/bigeagle/godns into domain-specs-name-server

2018-02-01 15:39:47 +08:00