[pull] master from AdguardTeam:master#44
Merged
pull[bot] merged 5 commits intou240:masterfrom Sep 6, 2022
Merged
Conversation
Added "b23.tv, bilicdn1.com, bilicdn2.com" for bilibili, "douyinpic.com, douyinstatic.com, douyinvod.com" for tiktok. Removed one redundant "||ixigua.com^" which appeared twice, also sorted tiktok.
Updates #4891. * commit '78389e518e51f852a6329b4f5be4f68ad6f3ab3a': Add some domains
Updates #4890. Squashed commit of the following: commit 20c8f33 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Sep 6 16:55:11 2022 +0300 dnsforward: imp names commit 2c21644 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Sep 6 16:36:46 2022 +0300 dnsforward: imp validations; refactor more commit 221e8c5 Merge: e5f5b76 58512c3 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Sep 6 14:57:31 2022 +0300 Merge branch 'master' into 4890-panic-internal-proxy commit e5f5b76 Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Sep 6 14:51:48 2022 +0300 dnsforward: fix panic; refactor
Merge in DNS/adguard-home from imp-dnsforward-cyclo to master Squashed commit of the following: commit ab05ebb Author: Ainar Garipov <A.Garipov@AdGuard.COM> Date: Tue Sep 6 18:43:18 2022 +0300 dnsforward: imp cyclo
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )