gently 23b77f2f52 Merge branch 'master' into dev ... # Conflicts: # adblock-for-dnsmasq.conf # anti-ad-domains.txt # anti-ad-easylist.txt # anti-ad-surge.txt		2020-02-11 13:21:29 +08:00
..
databases	更新文件列表	2019-12-14 19:27:05 +08:00
Net	更新文件列表	2019-12-14 19:27:05 +08:00
addressMaker.class.php	修复逻辑	2020-02-11 13:02:52 +08:00
black_domain_list.php	update black list	2020-02-11 13:17:26 +08:00
IP2Location.php	更新文件列表	2019-12-14 19:27:05 +08:00
utils.class.php	Formatted main code	2020-01-19 12:01:22 +08:00
white_domain_list.php	增加一个失效白名单规则的特性，针对引入外部白名单时，可以单条控制是否生效	2020-02-11 12:12:30 +08:00
writerFormat.class.php	更新输出格式	2020-02-10 17:45:44 +08:00