Merge in DNS/adguard-home from AG-25392-confmigrate to master Squashed commit of the following: commit 695717573e228a71e387d1b597f0d32f2eb20e67 Merge: 2c4f3e09627ec6cd59Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 31 16:22:55 2023 +0300 Merge branch 'master' into AG-25392-confmigrate commit 2c4f3e096bb14724c0d0fcc20e5ac1462068504e Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Thu Aug 31 16:13:14 2023 +0300 all: imp code commit 0fc6854598a67fc5ea74a93ff8c99b32886f43f1 Merge: 719f2db95a2ca8b5b4Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 30 18:30:36 2023 +0300 Merge branch 'master' into AG-25392-confmigrate commit 719f2db95a337f343752f5b18ce935bae83127be Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 30 15:50:52 2023 +0300 home: don't reread config commit 2e25fb738b11675d25574da9e5eebacd72a793ba Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 30 15:43:57 2023 +0300 all: imp code commit be3021f03097e18228dd9904dacc283f2576472e Author: Eugene Burkov <E.Burkov@AdGuard.COM> Date: Wed Aug 30 15:25:46 2023 +0300 all: introduce confmigrate
32 KiB
32 KiB