Merge pull request #549 from DandelionSprout/patch-35

Monday night pull
This commit is contained in:
Collin M. Barrett 2018-10-01 18:29:46 +00:00 committed by GitHub
commit 035b8ee941
2 changed files with 86 additions and 2 deletions

View file

@ -3227,7 +3227,7 @@
},
{
"id": 296,
"description": "Low spec for equipment extremists blocked.",
"description": "For low-spec equipment - Blocks very broadly",
"descriptionSourceUrl": "https://blogram.net/2010/04/23/adblock/",
"discontinuedDate": "2014-11-19T00:00:00",
"homeUrl": "https://blogram.net/2010/04/23/adblock/",

View file

@ -151,6 +151,10 @@
"filterListId": 29,
"tagId": 8
},
{
"filterListId": 30,
"tagId": 9
},
{
"filterListId": 31,
"tagId": 2
@ -195,10 +199,26 @@
"filterListId": 41,
"tagId": 6
},
{
"filterListId": 42,
"tagId": 7
},
{
"filterListId": 43,
"tagId": 7
},
{
"filterListId": 44,
"tagId": 7
},
{
"filterListId": 45,
"tagId": 6
},
{
"filterListId": 45,
"tagId":14
},
{
"filterListId": 46,
"tagId": 6
@ -243,6 +263,14 @@
"filterListId": 54,
"tagId": 2
},
{
"filterListId": 55,
"tagId": 3
},
{
"filterListId": 55,
"tagId": 6
},
{
"filterListId": 56,
"tagId": 2
@ -815,6 +843,14 @@
"filterListId": 171,
"tagId": 2
},
{
"filterListId": 173,
"tagId": 2
},
{
"filterListId": 173,
"tagId": 6
},
{
"filterListId": 174,
"tagId": 3
@ -879,6 +915,10 @@
"filterListId": 189,
"tagId": 2
},
{
"filterListId": 190,
"tagId": 7
},
{
"filterListId": 191,
"tagId": 6
@ -1325,7 +1365,7 @@
},
{
"filterListId": 280,
"tagId": 15
"tagId": 21
},
{
"filterListId": 281,
@ -1595,10 +1635,18 @@
"filterListId": 341,
"tagId": 4
},
{
"filterListId": 342,
"tagId": 15
},
{
"filterListId": 343,
"tagId": 8
},
{
"filterListId": 344,
"tagId": 9
},
{
"filterListId": 345,
"tagId": 2
@ -1615,6 +1663,10 @@
"filterListId": 347,
"tagId": 6
},
{
"filterListId": 348,
"tagId": 6
},
{
"filterListId": 349,
"tagId": 9
@ -1815,6 +1867,10 @@
"filterListId": 392,
"tagId": 16
},
{
"filterListId": 393,
"tagId": 15
},
{
"filterListId": 394,
"tagId": 2
@ -1927,6 +1983,10 @@
"filterListId": 419,
"tagId": 2
},
{
"filterListId": 420,
"tagId": 7
},
{
"filterListId": 421,
"tagId": 7
@ -1943,6 +2003,14 @@
"filterListId": 424,
"tagId": 13
},
{
"filterListId": 425,
"tagId": 20
},
{
"filterListId": 426,
"tagId": 6
},
{
"filterListId": 427,
"tagId": 7
@ -1959,6 +2027,10 @@
"filterListId": 430,
"tagId": 6
},
{
"filterListId": 431,
"tagId": 15
},
{
"filterListId": 432,
"tagId": 15
@ -1983,6 +2055,10 @@
"filterListId": 437,
"tagId": 2
},
{
"filterListId": 438,
"tagId": 15
},
{
"filterListId": 439,
"tagId": 3
@ -2067,6 +2143,10 @@
"filterListId": 460,
"tagId": 3
},
{
"filterListId": 461,
"tagId": 3
},
{
"filterListId": 462,
"tagId": 6
@ -2483,6 +2563,10 @@
"filterListId": 539,
"tagId": 2
},
{
"filterListId": 543,
"tagId": 19
},
{
"filterListId": 546,
"tagId": 19