Merge branch 'ScriptCleanup-Dev'

Browse Source

Conflicts:
	README.md
	advanced/Scripts/blacklist.sh
	advanced/Scripts/piholeDebug.sh
	advanced/Scripts/whitelist.sh
	automated install/basic-install.sh
	gravity.sh

...

This commit is contained in:

nate

2016-03-28 12:58:44 -05:00

parent a0cf93a7ca a4fbccac9b

commit 2311b42bca

8 changed files with 335 additions and 138 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

advanced/Scripts/piholeDebug.sh Executable file → Normal file