Merge remote-tracking branch 'origin/master'
# Conflicts: # data/data.json
This commit is contained in:
		
						commit
						3f4eca1890
					
				| 
						 | 
					@ -57,6 +57,9 @@
 | 
				
			||||||
            ],
 | 
					            ],
 | 
				
			||||||
            "exceptions": [
 | 
					            "exceptions": [
 | 
				
			||||||
                ".*(mail\\.google\\.)\\w{2,}(\\/mail\\/u\\/0)\\/.*",
 | 
					                ".*(mail\\.google\\.)\\w{2,}(\\/mail\\/u\\/0)\\/.*",
 | 
				
			||||||
 | 
					                ".*(mail\\.google\\.)\\w{2,}(\\/mail\\/u\\/0)\\/.*",
 | 
				
			||||||
 | 
					                ".*(google\\.)\\w{2,}(\\/upload)?(\\/drive)\\/.*",
 | 
				
			||||||
 | 
					                ".*(docs\\.google\\.)\\w{2,}\\/.*",
 | 
				
			||||||
                ".*(accounts\\.google\\.)\\w{2,}.*",
 | 
					                ".*(accounts\\.google\\.)\\w{2,}.*",
 | 
				
			||||||
                ".*(google\\.)\\w{2,}\\/searchbyimage\\?image_url=[^\\/|\\?|&]*(\\/|&(amp;)?)?"
 | 
					                ".*(google\\.)\\w{2,}\\/searchbyimage\\?image_url=[^\\/|\\?|&]*(\\/|&(amp;)?)?"
 | 
				
			||||||
            ],
 | 
					            ],
 | 
				
			||||||
| 
						 | 
					@ -170,7 +173,7 @@
 | 
				
			||||||
            "urlPattern": "(https:\\/\\/||http:\\/\\/).*([\\.]?twitter\\.)\\w{2,}\\/.*",
 | 
					            "urlPattern": "(https:\\/\\/||http:\\/\\/).*([\\.]?twitter\\.)\\w{2,}\\/.*",
 | 
				
			||||||
            "completeProvider": false,
 | 
					            "completeProvider": false,
 | 
				
			||||||
            "rules": [
 | 
					            "rules": [
 | 
				
			||||||
                "src=[^\\/|\\?|&]*(\\/|&(amp;)?)?"
 | 
					                "(ref_)?src=[^\\/|\\?|&]*(\\/|&(amp;)?)?"
 | 
				
			||||||
            ],
 | 
					            ],
 | 
				
			||||||
            "exceptions": [],
 | 
					            "exceptions": [],
 | 
				
			||||||
            "redirections": []
 | 
					            "redirections": []
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue
	
	Block a user