Merge branch 'master' of github.com:gorhill/uBlock

This commit is contained in:
Chris 2015-01-11 14:52:48 -07:00
commit 293fd7c6b2
2 changed files with 6 additions and 2 deletions

View file

@ -1,5 +1,5 @@
7edb2a585b445f28aa5ab06306f1a23f assets/ublock/privacy.txt
ef77312fb92d6732a7ea38dc72fd45a7 assets/ublock/filters.txt
07fcbc56c5cf3a2b5e98fb452ee70a70 assets/ublock/filters.txt
dcf3e05bae803343c9d632f0baf8bedd assets/ublock/mirror-candidates.txt
076ba56e9d4fe19fac773e59a09b1c8f assets/ublock/filter-lists.json
132b3ecc9da8a68c3faf740c00af734b assets/thirdparties/adblock-plus-japanese-filter.googlecode.com/hg/abp_jp.txt

View file

@ -219,3 +219,7 @@ www.thesimsresource.com##.ad-topleader
# https://github.com/gorhill/uBlock/issues/466
# Until fixed in EasyPrivacy
@@/google-analytics-dashboard
# https://twitter.com/poroot/status/554300983472574465
charlie.strim.io#@##tweets
ovh.strim.io#@##tweets