Eugene Burkov 0fb6d6163d Pull request 2030: 6156 upd proxy ...

Merge in DNS/adguard-home from 6156-upd-proxy to master

Updates #6156.

Squashed commit of the following:

commit 8e765f781e05dbf68d1d1bc89369b3aa37cbbd4f
Merge: b18d0aed5 3ec76cdef
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Oct 9 15:51:22 2023 +0300

    Merge branch 'master' into 6156-upd-proxy

commit b18d0aed5f34cf7eba583b6622dab9bfeb210f8a
Author: Eugene Burkov <E.Burkov@AdGuard.COM>
Date:   Mon Oct 9 13:06:42 2023 +0300

    all: upd proxy

2023-10-11 12:49:22 +03:00

16 KiB

Raw Blame History

View Raw