Merge branch 'master' into master

This commit is contained in:
Collin M. Barrett 2018-06-30 19:10:42 +00:00 committed by GitHub
commit 2d81f57704
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 12 deletions

View file

@ -6484,18 +6484,18 @@
"description": "Blocks banners (paypal, payu, bitcoin and patronite), charity banners, other forms of inclination to support on Polish sites.",
"descriptionSourceUrl": null,
"discontinuedDate": null,
"donateUrl": "https://patronite.pl/polskiefiltry",
"donateUrl": "https://authedmine.com/media/miner.html?key=ZpmDZUFJhHdv1YZHpCHFWhAUQIGa67TV",
"emailAddress": null,
"forumUrl": null,
"homeUrl": "http://www.certyficate.it/",
"issuesUrl": "https://github.com/MajkiIT/polish-ads-filter/issues",
"homeUrl": "https://github.com/KonoromiHimaries/PolishSubFilters",
"issuesUrl": null,
"licenseId": 9,
"name": "Polish Anti-Subsidy Filters",
"name": "Polish Anti-Donate Filters",
"policyUrl": null,
"publishedDate": "2018-01-06T00:00:00",
"submissionUrl": null,
"syntaxId": 3,
"viewUrl": "https://raw.githubusercontent.com/MajkiIT/polish-ads-filter/master/anti-donate-filters/adblock_anty-dotacje.txt"
"viewUrl": "https://raw.githubusercontent.com/KonoromiHimaries/PolishSubFilters/master/internal-filters/anti-donate-filters/anty-donacje.txt"
},
{
"id": 343,
@ -6509,7 +6509,7 @@
"homeUrl": "http://www.certyficate.it/",
"issuesUrl": "https://github.com/MajkiIT/polish-ads-filter/issues",
"licenseId": 9,
"name": "Polish Cookies Filters - Supplement for uBlock and AdGuard",
"name": "Polish Cookies Filters - Supplement for uBlock & AdGuard",
"policyUrl": null,
"publishedDate": "2018-01-12T00:00:00",
"submissionUrl": null,
@ -6522,11 +6522,11 @@
"description": "Blocks internal advertising, paid subscriptions, own stores on Polish sites.",
"descriptionSourceUrl": null,
"discontinuedDate": null,
"donateUrl": "https://patronite.pl/polskiefiltry",
"donateUrl": "https://authedmine.com/media/miner.html?key=ZpmDZUFJhHdv1YZHpCHFWhAUQIGa67TV",
"emailAddress": null,
"forumUrl": null,
"homeUrl": "https://github.com/KonoromiHimaries/PolishSubFilters/",
"issuesUrl": "https://github.com/MajkiIT/polish-ads-filter/issues",
"issuesUrl": null,
"licenseId": 9,
"name": "Polish Internal Filters",
"policyUrl": null,

View file

@ -285,7 +285,7 @@
},
{
"filterListId": 342,
"maintainerId": 32
"maintainerId": 63
},
{
"filterListId": 343,
@ -293,7 +293,7 @@
},
{
"filterListId": 344,
"maintainerId": 32
"maintainerId": 63
},
{
"filterListId": 345,

View file

@ -213,7 +213,7 @@
"id": 32,
"emailAddress": null,
"homeUrl": "https://github.com/MajkiIT",
"name": "Maciej M.",
"name": "MajkiIT",
"twitterHandle": null
},
{
@ -473,6 +473,8 @@
"emailAddress": null,
"homeUrl": "https://github.com/notracking",
"name": "notracking",
"homeUrl": "https://github.com/KonoromiHimaries",
"name": "KonoromiHimaries",
"twitterHandle": null
}
]
]