Merge branch 'development'

Conflicts:
	gravity.sh
This commit is contained in:
nate 2016-04-01 11:08:46 -05:00
commit bb66d559e7
2 changed files with 2 additions and 2 deletions

View file

@ -10,7 +10,7 @@
# (at your option) any later version.
# Pi-hole: Update the ad sources once a week on Sunday at 01:59
# Download any updates from the ad lists
# Download any updates from the adlists
59 1 * * 7 root /usr/local/bin/gravity.sh
# Pi-hole: Update the Web interface shortly after gravity runs

View file

@ -246,7 +246,7 @@ function gravity_Whitelist() {
echo ":::"
# Prevent our sources from being pulled into the hole
plural=; [[ "${sources[@]}" != "1" ]] && plural=s
echo -n "::: Adding ${#sources[@]} ad list source${plural} to the whitelist..."
echo -n "::: Adding ${#sources[@]} adlist source${plural} to the whitelist..."
urls=()
for url in "${sources[@]}"