mirror of https://github.com/gorhill/uBlock.git
Merge branch 'master' of https://github.com/AlexVallat/uBlock
Conflicts: platform/firefox/vapi-background.js
This commit is contained in:
commit
22c60bd95e
Conflicts: platform/firefox/vapi-background.js