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

Fix assets #3788

Merged
merged 2 commits into from Feb 18, 2024
Merged

Fix assets #3788

merged 2 commits into from Feb 18, 2024

Conversation

remusao
Copy link
Collaborator

@remusao remusao commented Feb 18, 2024

No description provided.

@remusao remusao added the PR: Internal 🏠 Changes only affect internals label Feb 18, 2024
@remusao remusao merged commit 5927a84 into master Feb 18, 2024
3 checks passed
@remusao remusao deleted the fix-assets-building2 branch February 18, 2024 20:55
seia-soto pushed a commit to seia-soto/adblocker that referenced this pull request Feb 19, 2024
* Fix codebooks generation
* Fix deserialization of resources containing UTF-8
* Remove unused filter files
* Fix ID collision
# Conflicts:
#	packages/adblocker/assets/easylist/easylist-cookie.txt
#	packages/adblocker/assets/easylist/easylist.txt
#	packages/adblocker/assets/easylist/easylistgermany.txt
#	packages/adblocker/assets/easylist/easyprivacy.txt
#	packages/adblocker/assets/peter-lowe/serverlist.txt
#	packages/adblocker/assets/ublock-origin/annoyances-cookies.txt
#	packages/adblocker/assets/ublock-origin/annoyances-others.txt
#	packages/adblocker/assets/ublock-origin/badware.txt
#	packages/adblocker/assets/ublock-origin/filters-2020.txt
#	packages/adblocker/assets/ublock-origin/filters-2021.txt
#	packages/adblocker/assets/ublock-origin/filters-2022.txt
#	packages/adblocker/assets/ublock-origin/filters-2023.txt
#	packages/adblocker/assets/ublock-origin/filters-2024.txt
#	packages/adblocker/assets/ublock-origin/filters-mobile.txt
#	packages/adblocker/assets/ublock-origin/filters.txt
#	packages/adblocker/assets/ublock-origin/privacy.txt
#	packages/adblocker/assets/ublock-origin/quick-fixes.txt
#	packages/adblocker/assets/ublock-origin/unbreak.txt
#	packages/adblocker/src/codebooks/network-filter.ts
#	packages/adblocker/src/codebooks/network-hostname.ts
#	packages/adblocker/src/codebooks/raw-network.ts
#	packages/adblocker/src/engine/engine.ts
seia-soto pushed a commit to seia-soto/adblocker that referenced this pull request Feb 21, 2024
* Fix codebooks generation
* Fix deserialization of resources containing UTF-8
* Remove unused filter files
* Fix ID collision
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
PR: Internal 🏠 Changes only affect internals
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant