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

This commit is contained in:
gorhill 2015-01-06 12:30:50 -05:00
commit f8110d1294
2 changed files with 5 additions and 1 deletions

View File

@ -1,5 +1,5 @@
6572a7bce5f1747fee597cb170bd3b98 assets/ublock/privacy.txt 6572a7bce5f1747fee597cb170bd3b98 assets/ublock/privacy.txt
8ebba513a75ed3f7ed964688c2c6071c assets/ublock/filters.txt 357a8d6f939dfb306029c352f4c85b50 assets/ublock/filters.txt
dcf3e05bae803343c9d632f0baf8bedd assets/ublock/mirror-candidates.txt dcf3e05bae803343c9d632f0baf8bedd assets/ublock/mirror-candidates.txt
076ba56e9d4fe19fac773e59a09b1c8f assets/ublock/filter-lists.json 076ba56e9d4fe19fac773e59a09b1c8f assets/ublock/filter-lists.json
132b3ecc9da8a68c3faf740c00af734b assets/thirdparties/adblock-plus-japanese-filter.googlecode.com/hg/abp_jp.txt 132b3ecc9da8a68c3faf740c00af734b assets/thirdparties/adblock-plus-japanese-filter.googlecode.com/hg/abp_jp.txt

View File

@ -211,3 +211,7 @@ www.thesimsresource.com##.ad-topleader
# To counter Peter Lowe's, hpHosts # To counter Peter Lowe's, hpHosts
@@||boldchat.com^$~third-party @@||boldchat.com^$~third-party
# https://github.com/gorhill/uBlock/issues/463
# To counter Peter Lowe's, hpHosts
@@||mixpanel.com^$~third-party