Adam Warner 61a40c1b43 merge devel into 4.3.2 And Resolve merge conflicts ... Signed-off-by: Adam Warner <me@adamwarner.co.uk>		2019-09-22 01:16:44 +01:00
..
bash-completion	Add arpflush to help and bash autocompletion	2019-06-15 09:08:33 +02:00
GIFs	Multiple gif files to choose from	2015-06-06 23:29:54 -05:00
Scripts	merge devel into 4.3.2 And Resolve merge conflicts	2019-09-22 01:16:44 +01:00
Templates	Only migrate files once (domain and adlist lists druing initial creation of gravity.db auditlog.list on database upgrade from version 1 to 2.	2019-07-07 10:33:08 +02:00
01-pihole.conf	Add use-application-dns.net = NXDOMAIN in ProcessDNSSettings rather than in the template so we can ensure that it will survive config-renewals.	2019-09-07 23:11:20 +02:00
blockingpage.css	Match current style of Web Interface	2017-10-04 01:05:44 +11: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
index.php	Remove outdated adlists.list check and fix empty adlists error message	2019-07-19 17:39:00 -07:00
lighttpd.conf.debian	Fix for 404 error when browsing to pi.hole (without /admin)	2019-08-20 11:29:17 -07:00
lighttpd.conf.fedora	Fix 404 error when browsing to pi.hole (without /admin) (for fedora)	2019-08-20 11:29:20 -07:00