merging changes from master

This commit is contained in:
gorhill 2015-04-27 19:38:28 -04:00
commit f2ce447b89

View file

@ -60,8 +60,5 @@
"http://*/*",
"https://*/*"
],
"short_name": "uBlock",
"web_accessible_resources": [
"document-blocked.html"
]
"short_name": "uBlock"
}