nate f8427ab789 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		2016-03-29 12:57:22 -05:00
..
GIFs	Multiple gif files to choose from	2015-06-06 23:29:54 -05:00
Scripts	Merge conflict resolution	2016-03-28 13:07:51 -05:00
01-pihole.conf	Merge remote-tracking branch 'origin/development'	2016-01-31 20:47:10 +00:00
cmdline.txt	consoleblank=0	2016-02-20 01:15:14 -06:00
console-setup	file to set lcd font size	2016-01-23 11:48:12 -06:00
dnsmasq.conf.original	remove trailing whitespace dnsmasq.conf.original	2016-03-05 21:14:17 -08:00
dphys-swapfile	Updated License	2016-01-30 15:12:40 -05:00
index.html	preparing files for merge and for testing automated install	2015-06-16 11:15:15 -05:00
index.js	no need for the X- header prefix in the string	2016-03-14 22:59:38 -05:00
lighttpd.conf	rewrite js files to a valid stub	2016-03-14 22:51:16 -05:00
pihole.cron	Updated License	2016-01-30 15:12:40 -05:00