mirror of
https://github.com/AdguardTeam/AdGuardHome.git
synced 2022-10-30 02:30:37 +03:00
Merge in DNS/adguard-home from imp-ups-tests to master
Squashed commit of the following:
commit 60c22e8dfb81c3613b00994ccf01ba96137946f9
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Oct 28 19:26:34 2022 +0300
all: imp names, fix aaaa
commit c3bd8a9fa95a86f5af86ea2956565337ee620c99
Merge: 23f82237 746e9df7
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Oct 28 19:16:56 2022 +0300
Merge branch 'master' into imp-ups-tests
commit 23f82237a81b0ef22cf418afdc2ec95dc50639a3
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Fri Oct 28 18:14:27 2022 +0300
all: imp upstream tests