Merge branch 'master' of github.com:gorhill/uBlock into fix-475

This commit is contained in:
gorhill 2015-01-22 12:36:24 -05:00
commit 9d1332be7d
2 changed files with 10 additions and 3 deletions

View File

@ -1,5 +1,5 @@
7edb2a585b445f28aa5ab06306f1a23f assets/ublock/privacy.txt
3c2af3ec09b6dd738e54c3f37173e707 assets/ublock/filters.txt
c120e92f634173e63362651858766da2 assets/ublock/filters.txt
dcf3e05bae803343c9d632f0baf8bedd assets/ublock/mirror-candidates.txt
9947b5510d67e47ea59ce876e4fc67be assets/ublock/filter-lists.json
132b3ecc9da8a68c3faf740c00af734b assets/thirdparties/adblock-plus-japanese-filter.googlecode.com/hg/abp_jp.txt

View File

@ -233,5 +233,12 @@ ovh.strim.io#@##tweets
@@||google-analytics.com/analytics.js$domain=www.vd.nl
# https://github.com/gorhill/uBlock/issues/570
# To counter hpHosts `yui.yahooapis.com`
@@||yui.yahooapis.com^
# To counter `yui.yahooapis.com` in hpHosts
@@||yui.yahooapis.com^
# Chrome store feedback
# To counter `top.mail.ru` in Peter Lowe's
@@||top.mail.ru^$~third-party
# https://github.com/gorhill/uBlock/issues/510#issuecomment-71050211
||racksauce.com^$domain=promptfile.com