mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2025-02-20 11:44:09 +08:00
Merge in DNS/adguard-home from 3846-hosts-querylog to master Updates #3846. Squashed commit of the following: commit 722e96628b1ccca1a5b5a716b8bcb1da2aefcc3b Merge: a20ad71e ed868fa4 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Tue Nov 23 17:52:08 2021 +0300 Merge branch 'master' into 3846-hosts-querylog commit a20ad71e723dbfa3483c3bdf9e4c8fd15c8b0e3c Author: Ildar Kamalov <ik@adguard.com> Date: Tue Nov 23 17:28:12 2021 +0300 client: fix variable name commit 7013bff05d6cff75c6c25a38d614db8b4b2f0b87 Author: Ildar Kamalov <ik@adguard.com> Date: Tue Nov 23 17:03:26 2021 +0300 client: fix missing import commit 8e4a0fb047b4d39ab44a285f59420573d7ba5eec Author: Ildar Kamalov <ik@adguard.com> Date: Tue Nov 23 16:56:50 2021 +0300 client: handle system host filter id commit abbbf662d2f3ea3f5d3569a9c45418e356adbf3c Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Nov 22 13:54:52 2021 +0300 all: imp code commit c2df63e46e75f84f70a610d18deccbeee672ebda Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Nov 22 12:50:51 2021 +0300 querylog: rm unused test data commit 8a1d47d266254fd4aedd4c61c7ea9e48168ea375 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Mon Nov 22 02:52:50 2021 +0300 aghnet: final imps commit ade3acb4bebc8bdd755e56f314cdf19bc9375557 Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Fri Nov 19 15:48:40 2021 +0300 all: add hosts container rule list support