Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from AdguardTeam:master #179

Merged
merged 3 commits into from
Jun 22, 2023
Merged

[pull] master from AdguardTeam:master #179

merged 3 commits into from
Jun 22, 2023

Conversation

pull[bot]
Copy link

@pull pull bot commented Jun 22, 2023

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

EugeneOne1 and others added 3 commits June 22, 2023 14:18
Merge in DNS/adguard-home from 4923-gopacket-dhcp to master

Updates #4923.

Squashed commit of the following:

commit edf36ce
Merge: a17513d 123ca87
Author: Eugene Burkov <[email protected]>
Date:   Thu Jun 22 14:14:39 2023 +0300

    Merge branch 'master' into 4923-gopacket-dhcp

commit a17513d
Merge: f04727c 994906f
Author: Eugene Burkov <[email protected]>
Date:   Wed Jun 21 17:49:09 2023 +0300

    Merge branch 'master' into 4923-gopacket-dhcp

commit f04727c
Author: Eugene Burkov <[email protected]>
Date:   Tue Jun 20 15:42:31 2023 +0300

    home: revert clients container

commit c58284a
Author: Eugene Burkov <[email protected]>
Date:   Mon Jun 19 21:10:36 2023 +0300

    all: imp code, names, docs

commit 4c4613c
Author: Eugene Burkov <[email protected]>
Date:   Tue Jun 13 18:51:12 2023 +0300

    all: imp code

commit 0b4a6e0
Author: Eugene Burkov <[email protected]>
Date:   Wed Jun 7 18:40:15 2023 +0300

    all: imp api

commit 0425ede
Author: Eugene Burkov <[email protected]>
Date:   Mon Jun 5 15:57:23 2023 +0300

    dhcpsvc: introduce package

commit 5628ebe
Author: Eugene Burkov <[email protected]>
Date:   Thu Jun 1 17:49:12 2023 +0300

    WIP
Merge in DNS/adguard-home from fix-blocked-services-client-schedule to master

Updates #951.

Squashed commit of the following:

commit 1c89095
Merge: ac0b722 f40ef76
Author: Stanislav Chzhen <[email protected]>
Date:   Thu Jun 22 15:54:03 2023 +0300

    Merge branch 'master' into fix-blocked-services-client-schedule

commit ac0b722
Author: Stanislav Chzhen <[email protected]>
Date:   Thu Jun 22 14:32:03 2023 +0300

    home: fix typo

commit 64eb519
Author: Stanislav Chzhen <[email protected]>
Date:   Thu Jun 22 14:23:07 2023 +0300

    home: add test case

commit c7b60f3
Author: Stanislav Chzhen <[email protected]>
Date:   Thu Jun 22 12:00:24 2023 +0300

    home: imp code

commit 7806c92
Author: Stanislav Chzhen <[email protected]>
Date:   Wed Jun 21 20:49:47 2023 +0300

    home: add tests

commit d37c9fd
Author: Stanislav Chzhen <[email protected]>
Date:   Wed Jun 21 18:49:43 2023 +0300

    home: fix client blocked services
Merge in DNS/adguard-home from 5700-fix-filter-delete to master

Squashed commit of the following:

commit 51e5c82
Merge: b4f8abd 37e046a
Author: Dimitry Kolyshev <[email protected]>
Date:   Thu Jun 22 17:05:23 2023 +0400

    Merge remote-tracking branch 'origin/master' into 5700-fix-filter-delete

commit b4f8abd
Merge: eac30a1 f40ef76
Author: Dimitry Kolyshev <[email protected]>
Date:   Thu Jun 22 16:55:58 2023 +0400

    Merge remote-tracking branch 'origin/master' into 5700-fix-filter-delete

commit eac30a1
Author: Dimitry Kolyshev <[email protected]>
Date:   Thu Jun 22 14:03:07 2023 +0400

    filtering: imp code

commit 4e27078
Author: Dimitry Kolyshev <[email protected]>
Date:   Thu Jun 22 14:02:04 2023 +0400

    all: docs

commit b818468
Author: Dimitry Kolyshev <[email protected]>
Date:   Thu Jun 22 13:18:12 2023 +0400

    filtering: fix filter delete
@pull pull bot added the ⤵️ pull label Jun 22, 2023
@pull pull bot merged commit 66345e8 into u240:master Jun 22, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants