Adam Warner 9e96ff37de

Fix merge conflicts ...

Signed-off-by: Adam Warner <me@adamwarner.co.uk>

2020-05-12 22:16:43 +01:00

..

database_migration

Add update to gravity database version 12, renaming the Unassociated group to Default group.

2020-05-07 18:01:37 +02:00

chronometer.sh

Assorted typo fixes. (#3126)

2020-03-08 16:53:14 -07:00

COL_TABLE

Assorted typo fixes. (#3126)

2020-03-08 16:53:14 -07:00

list.sh

Add option --comment "whatever" for adding comments for new domains through the CLI interface.

2020-03-27 08:45:04 +01:00

piholeARPTable.sh

Do not flush neigh cache as this is known to create a number of issues. The better aproach to this is to manually flush the ARP cache by either restarting or calling "ip neigh flush all".

2020-04-01 17:19:32 +00:00

piholeCheckout.sh

Assorted typo fixes. (#3126)

2020-03-08 16:53:14 -07:00

piholeDebug.sh

Fix merge conflicts

2020-05-12 22:16:43 +01:00

piholeLogFlush.sh

Incorporates changes requested by @Mcat12

2019-05-01 11:20:26 +02:00

query.sh

Update development from release/v5.0 (#3200)

2020-03-08 16:38:53 -07:00

setupLCD.sh

Assorted typo fixes. (#3126)

2020-03-08 16:53:14 -07:00

update.sh

then

2020-02-19 17:46:45 +00:00

updatecheck.sh

Merge branch 'development' into release/v4.3

2019-05-18 13:18:14 -07:00

version.sh

Improve else condition of branch determination

2020-04-21 16:08:32 +02:00

webpage.sh

Merge pull request #3255 from pi-hole/tweak/emailregex

2020-05-06 09:48:26 +02:00

wildcard_regex_converter.sh

make some shebangs comply to posix standard

2019-11-05 22:33:00 +01:00