mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2025-02-20 11:44:09 +08:00
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