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

Add my mirrors #2606

Merged
merged 5 commits into from
Oct 25, 2021
Merged

Add my mirrors #2606

merged 5 commits into from
Oct 25, 2021

Conversation

iam-py-test
Copy link
Contributor

@iam-py-test iam-py-test commented Oct 21, 2021

This adds mirrors for my antimalware blocklist
I'm not sure whether I should use GH pages or GitLab, but as I have heard of issues with GitLab, I chose GH pages
Please don't merge this PR yet, as I want to make more changes tomorrow

@collinbarrett collinbarrett added the directory-data changes to basic FilterLists data label Oct 22, 2021
@collinbarrett
Copy link
Owner

uh oh. more merge conflicts... I was trying to wait to merge per your request, but another PR just went through that introduces conflicts here...

we really need to revamp our data update system (ref #372 )... sigh.

@iam-py-test
Copy link
Contributor Author

uh oh. more merge conflicts... I was trying to wait to merge per your request, but another PR just went through that introduces conflicts here...

we really need to revamp our data update system (ref #372 )... sigh.

Understood
Its kind-of my fault for procrastinating finishing this PR anyway

@iam-py-test
Copy link
Contributor Author

iam-py-test commented Oct 23, 2021

@collinbarrett sorry for the delay
I think it is ready to merge (sorry about the conflicts)

@collinbarrett collinbarrett merged commit 4732e32 into collinbarrett:master Oct 25, 2021
collinbarrett added a commit that referenced this pull request Oct 25, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
directory-data changes to basic FilterLists data
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants