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

Support unified adblock catalog #687

Merged
merged 1 commit into from
Sep 19, 2023
Merged

Support unified adblock catalog #687

merged 1 commit into from
Sep 19, 2023

Conversation

antonok-edm
Copy link
Collaborator

Required for brave/brave-core#19946
Depends on brave/adblock-resources#130

Will update listCatalogUrl prior to merging - right now it points to the unified-catalog branch of adblock-resources.

list_catalog.json is added directly into the existing regional catalog component. regional_catalog.json is still generated from the contents of list_catalog.json and added there for backwards compatibility. It can be removed once most users have updated beyond the versions where list_catalog.json is supported.

Copy link
Contributor

@pes10k pes10k left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@antonok-edm antonok-edm merged commit cfe0a89 into master Sep 19, 2023
5 checks passed
@antonok-edm antonok-edm deleted the unified-catalog branch September 19, 2023 19:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants