Merge remote-tracking branch 'refs/remotes/pi-hole/development'

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-29 12:57:22 -05:00
6 changed files with 13 additions and 11 deletions

View File

@@ -170,9 +170,6 @@ function gravity_transport() {
fi
# Silently curl url
curl -s $cmd_ext $heisenbergCompensator -A "$agent" $url > $patternBuffer
# Check for list updates
gravity_patternCheck $patternBuffer
curl -s "$cmd_ext" "$heisenbergCompensator" -A "$agent" "$url" > "$patternBuffer"
# Check for list updates
gravity_patternCheck "$patternBuffer"