AdGuardHome

mirror of https://github.com/AdguardTeam/AdGuardHome.git synced 2025-02-20 11:44:09 +08:00

History

Dimitry Kolyshev 31f7aaecc3 Pull request : 6126-client: boostrap dns

Merge in DNS/adguard-home from 6126-bootstrap-dns to master

Squashed commit of the following:

commit 024e0280fb12f36e9d151132d1042c6c3c78615b
Merge: f2be5189d 3722c2846
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Aug 23 16:09:48 2023 +0300

    Merge remote-tracking branch 'origin/master' into 6126-bootstrap-dns

commit f2be5189da339830cbbef4dfc0399d23b4284320
Merge: 311429086 2bfc9fcb1
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Wed Aug 23 15:56:30 2023 +0300

    Merge remote-tracking branch 'origin/master' into 6126-bootstrap-dns

commit 3114290863f8d50f144ca519f396a7509897ed4a
Merge: 332e28730 cb6d4620c
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Tue Aug 22 17:33:20 2023 +0300

    Merge remote-tracking branch 'origin/master' into 6126-bootstrap-dns

commit 332e2873056771d2ba30188891e2b03ee0cb6cd6
Author: Shared Content Manager account <translate@adguard.com>
Date:   Tue Aug 22 17:32:28 2023 +0300

    client: imd texts

commit 83162fc835580e08bced3c70ebdc37ef139d0f38
Author: Dimitry Kolyshev <dkolyshev@adguard.com>
Date:   Tue Aug 22 16:29:41 2023 +0300

    client: boostrap dns

2023-08-23 16:37:35 +03:00

public

AG-21485 - Login theme bugfix.

2023-04-18 14:31:20 +03:00

src

Pull request : 6126-client: boostrap dns

2023-08-23 16:37:35 +03:00

.eslintrc.json

+ client: Refactor DHCP settings

2020-08-20 15:19:59 +03:00

.gitattributes

+ client: Update packages - Merge pull request #613 in DNS/adguard-home from fix/1597 to master