mirror of
https://git.vectorsigma.ru/public/AdGuardHome.git
synced 2026-07-29 19:59:20 +00:00
Merge in DNS/adguard-home from 4581-filters-json to master Squashed commit of the following: commit da0b86983432ac1791645da328df5848daac5ea6 Merge: 62fa4fc6a82ec09aAuthor: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed May 25 12:58:25 2022 +0200 Merge remote-tracking branch 'origin/master' into 4581-filters-json commit 62fa4fc6ff150ebb8dbd8888a58819fb644d43ad Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Wed May 25 11:55:52 2022 +0200 all: filters json commit 96486ffbb41947b5e748f6e35eb96ee73867eba1 Merge: 9956f0afc0ac82beAuthor: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue May 24 15:57:52 2022 +0200 Merge branch 'master' into 4581-filters-json commit 9956f0aff1b7029f336d22013a62f2871a964322 Author: Dimitry Kolyshev <dkolyshev@adguard.com> Date: Tue May 24 15:53:43 2022 +0200 all: filters json