ainur/pi-hole
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'ScriptCleanup'

Browse Source 
Conflicts:
	README.md
	advanced/Scripts/blacklist.sh
	advanced/Scripts/whitelist.sh
	automated install/basic-install.sh
	gravity.sh
This commit is contained in:
nate
2016-03-28 12:21:18 -05:00
parent 1d80fdddd4 c520c55ff4
commit 8ef4c12f97
8 changed files with 336 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
adlists.default
+1
View File
@@ -25,6 +25,7 @@ https://s3.amazonaws.com/lists.disconnect.me/simple_ad.txt
http://hosts-file.net/ad_servers.txt
# Mahakala list. Has been known to block legitimage domains including the entire .com range.
# Warning: Due to the sheer size of this list, the web admin console will be unresponsive.
#http://adblock.mahakala.is/
# ADZHOSTS list. Has been known to block legitimate domains