diff --git a/data/FilterList.json b/data/FilterList.json index faaae2428..b612157f4 100644 --- a/data/FilterList.json +++ b/data/FilterList.json @@ -4887,12 +4887,12 @@ "forumUrl": null, "homeUrl": "https://disconnect.me/trackerprotection", "issuesUrl": null, - "licenseId": 5, + "licenseId": 4, "name": "Disconnect Tracking Filter List", "policyUrl": null, "publishedDate": null, "submissionUrl": null, - "syntaxId": null, + "syntaxId": 2, "viewUrl": "https://s3.amazonaws.com/lists.disconnect.me/simple_tracking.txt" }, { @@ -4905,12 +4905,12 @@ "forumUrl": null, "homeUrl": "https://disconnect.me/trackerprotection", "issuesUrl": null, - "licenseId": 5, + "licenseId": 4, "name": "Disconnect Malware Filter List", "policyUrl": null, "publishedDate": null, "submissionUrl": null, - "syntaxId": null, + "syntaxId": 2, "viewUrl": "https://s3.amazonaws.com/lists.disconnect.me/simple_malware.txt" }, { @@ -4923,12 +4923,12 @@ "forumUrl": null, "homeUrl": "https://disconnect.me/trackerprotection", "issuesUrl": null, - "licenseId": 5, + "licenseId": 4, "name": "Disconnect Malvertising Filter List", "policyUrl": null, "publishedDate": null, "submissionUrl": null, - "syntaxId": null, + "syntaxId": 2, "viewUrl": "https://s3.amazonaws.com/lists.disconnect.me/simple_malvertising.txt" }, { @@ -4941,12 +4941,12 @@ "forumUrl": null, "homeUrl": "https://disconnect.me/trackerprotection", "issuesUrl": null, - "licenseId": 5, + "licenseId": 4, "name": "Disconnect Advertising Filter List", "policyUrl": null, "publishedDate": null, "submissionUrl": null, - "syntaxId": null, + "syntaxId": 2, "viewUrl": "https://s3.amazonaws.com/lists.disconnect.me/simple_ad.txt" }, { diff --git a/data/FilterListMaintainer.json b/data/FilterListMaintainer.json index 08a555fd2..70523bc7c 100644 --- a/data/FilterListMaintainer.json +++ b/data/FilterListMaintainer.json @@ -358,5 +358,21 @@ { "filterListId": 348, "maintainerId": 44 + }, + { + "filterListId": 272, + "maintainerId": 45 + }, + { + "filterListId": 273, + "maintainerId": 45 + }, + { + "filterListId": 274, + "maintainerId": 45 + }, + { + "filterListId": 275, + "maintainerId": 45 } ] \ No newline at end of file diff --git a/data/Maintainer.json b/data/Maintainer.json index 200903c7b..f225e4e92 100644 --- a/data/Maintainer.json +++ b/data/Maintainer.json @@ -299,5 +299,12 @@ "homeUrl": "http://vxvault.net/", "name": "VXVault", "twitterHandle": null + }, + { + "id": 45, + "emailAddress": "support@disconnect.me", + "homeUrl": "https://disconnect.me", + "name": "Disconnect", + "twitterHandle": "disconnectme" } ] \ No newline at end of file diff --git a/data/Merge.json b/data/Merge.json index 5ab284024..fc2c06685 100644 --- a/data/Merge.json +++ b/data/Merge.json @@ -119,6 +119,14 @@ "mergeFilterListId": 271, "upstreamFilterListId": 338 }, + { + "mergeFilterListId": 274, + "upstreamFilterListId": 273 + }, + { + "mergeFilterListId": 274, + "upstreamFilterListId": 275 + }, { "mergeFilterListId": 309, "upstreamFilterListId": 17