Merge in DNS/adguard-home from 5471-new-trackers-db to master Squashed commit of the following: commit d90742c2902afd3424fb8721419231493610048b Merge: 5e87a1f2 a50a8abb Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Feb 14 13:38:40 2023 +0300 Merge branch 'master' into 5471-new-trackers-db commit 5e87a1f25cd1d1dc52629d36e3d50d032ada1093 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Mon Feb 13 18:38:54 2023 +0300 all: use new tracker source
a50a8abb
Merge in DNS/adguard-home from upd-companiesdb to master Squashed commit of the following: commit c38ccd89a46193b24393c00b4a83ed439f6d7469 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Wed Oct 19 12:00:58 2022 +0300 client: upd trackers
Merge in DNS/adguard-home from 2793-whotracksme to master Squashed commit of the following: commit eff9de98b389ba087eb529c12e3ec916842aa8c3 Merge: bf9bc6a4 49eb62ae Author: Andrey Meshkov <am@adguard.com> Date: Wed Dec 15 16:38:53 2021 +0300 Merge branch 'master' into 2793-whotracksme commit bf9bc6a4f5c1d7e4b6265f1c33bd532ec5b58cc7 Author: Andrey Meshkov <am@adguard.com> Date: Wed Dec 15 16:04:57 2021 +0300 scripts: fix review comments commit 5a035cabc1a75a3c750a4a7a36af38ad9f33959b Author: Andrey Meshkov <am@adguard.com> Date: Wed Dec 15 15:47:41 2021 +0300 added companiesdb script, fix #2793
49eb62ae