mirror of
https://git.vectorsigma.ru/public/AdGuardHome.git
synced 2026-07-29 07:59:09 +00:00
Merge in DNS/adguard-home from imp-en-i18n to master
Squashed commit of the following:
commit 67f8e438141e7b4ff5b71b73fb8e224ac702b702
Merge: 443b7493 3f1fd56b
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 2 14:26:39 2021 +0300
Merge branch 'master' into imp-en-i18n
commit 443b7493eff62c3dbf29ec01fbd1824cdf9f5dfc
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Wed Jun 2 13:56:43 2021 +0300
client: fix accidental removal
commit d8bb7ba3e455eea70c6445e08131a9b3902c4638
Author: Ainar Garipov <A.Garipov@AdGuard.COM>
Date: Tue Jun 1 19:21:24 2021 +0300
client: imp en i18n