mirror of
https://git.vectorsigma.ru/public/AdGuardHome.git
synced 2026-08-01 19:49:25 +00:00
Merge in DNS/adguard-home from imp-cache-label to master
Squashed commit of the following:
commit 10f62aa078b5306525578e22476835ee2e7bac66
Merge: 08c2de0e fe8be370
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Oct 4 16:30:43 2022 +0300
Merge branch 'master' into imp-cache-label
commit 08c2de0edbb1138b47d1a02d6630aa99b7ddcec9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Oct 4 16:19:36 2022 +0300
client: imp label
commit e66fbbe3cc6f929ff26fe3d7b8e14acc95f5c0ff
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Oct 4 16:17:15 2022 +0300
client: imp upstream example
commit d073f71cc5df4ba5f7de7ed08ad1215f7a198539
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Oct 4 15:44:58 2022 +0300
client: imp upstreams
commit b78d06db645a9f496bed699f4d4bf8c7396148f3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Oct 4 14:59:30 2022 +0300
client: imp cache size label