Tommy Huff 3b6ecc573e fix conflict ...

Merge remote-tracking branch 'upstream/promoTweaksTheSecond' into EnableOrDisable

2016-10-20 10:09:23 -04:00

..

bash-completion

update pihole bash-completion

2016-10-15 20:12:16 +01:00

GIFs

Multiple gif files to choose from

2015-06-06 23:29:54 -05:00

Scripts

use pihole instead of direct path

2016-10-20 06:30:48 -04:00

selinux

SELinux Support

2016-06-11 15:58:49 -06:00

01-pihole.conf

Add direction to change upstream servers in setupVars.conf

2016-10-18 10:35:22 +01: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

Added window.close() to index.html

2016-08-19 20:45:17 -04:00

index.js

no need for the X- header prefix in the string

2016-03-14 22:59:38 -05:00

lighttpd.conf.debian

fixing whitespace

2016-06-11 15:58:48 -06:00

lighttpd.conf.fedora

add mimetype for .svg

2016-10-05 01:20:30 +02:00

pihole.cron

Remove reference to non-existent script

2016-10-20 13:29:12 +01:00

pihole.sudo

Change mode of sudoer file

2016-04-17 22:49:47 -04:00