From 10bb55dfb25153e1293f4ead24e98b7fb9dd9ce7 Mon Sep 17 00:00:00 2001
From: "Collin M. Barrett" <collinbarrett@users.noreply.github.com>
Date: Tue, 13 Feb 2018 07:43:54 -0600
Subject: [PATCH] add Monojp's Hosts

closes #189
---
 data/FilterList.json           | 17 +++++++++++++++++
 data/FilterListLanguage.json   |  4 ++++
 data/FilterListMaintainer.json |  4 ++++
 data/Maintainer.json           |  7 +++++++
 data/Merge.json                |  4 ++++
 5 files changed, 36 insertions(+)

diff --git a/data/FilterList.json b/data/FilterList.json
index f566d25850..a8dfce0aca 100644
--- a/data/FilterList.json
+++ b/data/FilterList.json
@@ -5523,5 +5523,22 @@
     "submissionUrl": null,
     "syntaxId": 1,
     "viewUrl": "https://github.com/bjornstar/hosts/blob/master/hosts"
+  },
+  {
+    "id": 326,
+    "description": "Hostfiles for adblocking / privacy reasons.",
+    "descriptionSourceUrl": "https://github.com/monojp/hosts_merge/blob/master/README.md",
+    "discontinuedDate": null,
+    "donateUrl": null,
+    "emailAddress": null,
+    "forumUrl": null,
+    "homeUrl": "https://github.com/monojp/hosts_merge",
+    "issuesUrl": "https://github.com/monojp/hosts_merge/issues",
+    "licenseId": 5,
+    "name": "Monojp's Hosts",
+    "policyUrl": null,
+    "submissionUrl": null,
+    "syntaxId": 2,
+    "viewUrl": "https://hosts.herndl.org/hosts_blacklist.txt"
   }
 ]
\ No newline at end of file
diff --git a/data/FilterListLanguage.json b/data/FilterListLanguage.json
index 15ea5fa75f..b29e138ea5 100644
--- a/data/FilterListLanguage.json
+++ b/data/FilterListLanguage.json
@@ -62,5 +62,9 @@
   {
     "filterListId": 61,
     "languageId": 11
+  },
+  {
+    "filterListId": 326,
+    "languageId": 141
   }
 ]
\ No newline at end of file
diff --git a/data/FilterListMaintainer.json b/data/FilterListMaintainer.json
index ff71ae95ad..45c42a2e0e 100644
--- a/data/FilterListMaintainer.json
+++ b/data/FilterListMaintainer.json
@@ -262,5 +262,9 @@
   {
     "filterListId": 325,
     "maintainerId": 35
+  },
+  {
+    "filterListId": 326,
+    "maintainerId": 36
   }
 ]
\ No newline at end of file
diff --git a/data/Maintainer.json b/data/Maintainer.json
index ab7d868635..669614d3ef 100644
--- a/data/Maintainer.json
+++ b/data/Maintainer.json
@@ -236,5 +236,12 @@
     "homeUrl": "https://bjornstar.com/",
     "name": "Bjorn Stromberg",
     "twitterHandle": null
+  },
+  {
+    "id": 36,
+    "emailAddress": null,
+    "homeUrl": "https://github.com/monojp",
+    "name": "Monojp",
+    "twitterHandle": null
   }
 ]
\ No newline at end of file
diff --git a/data/Merge.json b/data/Merge.json
index 3b91f1d7cc..5907bc487e 100644
--- a/data/Merge.json
+++ b/data/Merge.json
@@ -198,5 +198,9 @@
   {
     "mergeFilterListId": 309,
     "upstreamFilterListId": 325
+  },
+  {
+    "mergeFilterListId": 309,
+    "upstreamFilterListId": 326
   }
 ]
\ No newline at end of file