Merge branch 'OperationBlockListFromGravity' of github.com:pi-hole/pi-hole into OperationBlockListFromGravity

Conflicts:
	automated install/basic-install.sh
This commit is contained in:
Promofaux 2016-01-27 21:16:35 +00:00
commit f2d71d41a8

View file

@ -5,4 +5,4 @@ http://www.malwaredomainlist.com/hostslist/hosts.txt
http://pgl.yoyo.org/adservers/serverlist.php? http://pgl.yoyo.org/adservers/serverlist.php?
http://someonewhocares.org/hosts/hosts http://someonewhocares.org/hosts/hosts
http://winhelp2002.mvps.org/hosts.txt http://winhelp2002.mvps.org/hosts.txt
http://mirror1.malwaredomains.com/files/justdomains http://mirror1.malwaredomains.com/files/justdomains