Mirrors/uBlock
1
0
Fork 0
mirror of https://github.com/gorhill/uBlock.git synced 2024-11-09 12:22:33 +01:00
Code Issues Releases Wiki Activity
2,612 Commits 2 Branches 960 Tags 210 MiB
361d2ac1a2
Commit Graph

386 Commits

Author SHA1 Message Date
gorhill
5aea3d9d34 new version 2015-03-04 19:26:46 -05:00
Chris
1e4f72579d Prevent crash on Safari < 8; code review 2015-03-04 15:30:47 -07:00
Deathamns
4a10a51d20 Firefox: different way for reloading a tab 2015-03-04 12:29:29 +01:00
AlexVallat
31188c6330 Tidying .xul location, update linux script to match windows one 2015-03-03 07:58:35 +00:00
AlexVallat
e222ace6ef Merge branch 'master' of https://github.com/gorhill/uBlock 2015-03-02 19:08:05 +00:00
AlexVallat
2b60436ece Initial UI support for Fennec 2015-03-02 18:49:34 +00:00
Deathamns
1d3205ea81 Firefox: block popups earlier 2015-03-02 18:36:04 +01:00
Deathamns
cc47d13207 Firefox: workaround for #886 2015-03-02 17:49:25 +01:00
Deathamns
8bedabb5ef Firefox: handle behind-the-scene redirects 2015-03-02 12:52:04 +01:00
Chris
91c7648212 Safari: minor scoping tweaks 2015-03-01 21:39:15 -07:00
Chris
83975124a4 Safari: XHR should explicitly fail. Fixes #878 2015-03-01 21:09:28 -07:00
gorhill
817c497a6b interim version for dev build 2015-03-01 19:25:56 -05:00
Deathamns
9dbb00819f Fennec: fix tab title 2015-03-01 21:38:51 +01:00
AlexVallat
4edbdd9dd5 https://github.com/gorhill/uBlock/issues/524#issuecomment-76620479 2015-03-01 19:47:03 +00:00
Deathamns
da3586adde Firefox/Fennec fixes 2015-03-01 20:21:05 +01:00
AlexVallat
a8c1cb9dff Fixing up basic functionality for Fennec 2015-03-01 17:45:12 +00:00
Deathamns
dc8623f1e8 Firefox/Fennec code cleanup 2015-02-28 20:46:49 +01:00
Cheng Sun
aa0e713c79 Fennec WIP #2 2015-02-28 20:46:48 +01:00
Cheng Sun
7a0044391b Use named "same document" constant instead of hardcoding 2015-02-28 20:46:47 +01:00
gorhill
7ad472e75d this fixes #903 2015-02-28 10:00:12 -05:00
Deathamns
9fe8f41426 Firefox: toolbar icon fixes for Firefox 36+ 2015-02-28 11:58:09 +01:00
Deathamns
18a636305f Firefox: behind-the-scene request types 2015-02-28 07:38:41 +01:00
gorhill
f4f7d56724 new version 2015-02-27 19:47:34 -05:00
Chris
d64a340d2e Safari: fix main_frame handling 2015-02-25 11:37:33 -07:00
gorhill
c7bab5502e this mitigates #520, #376 2015-02-23 18:31:29 -05:00
Chris
ed5891d876 Safari: storage quota and new version 2015-02-23 12:00:35 -07:00
Chris
58ae9f266b Safari: block programmatic image requests, more thorough XHR 
Currently, this is done the same way we block XMLHttpRequests: mess
with the constructor. This was done in the most efficient way I
could think of (overhead is relatively minimal). This also
injects uBlock's blocking interceptor earlier, thusly covering
more requests that may have slipped through before.
 2015-02-22 22:13:54 -07:00
Chris
29fa6cb2e8 Safari: block programmatic image requests 
Currently, this is done the same way we block XMLHttpRequests: mess
with the constructor. This was done in the most efficient way I
could think of (overhead is relatively minimal).
 2015-02-22 22:00:37 -07:00
gorhill
37aaeca8aa code review 2015-02-22 23:47:22 -05:00
gorhill
824c499f5c this fixes #862 2015-02-22 09:13:08 -05:00
gorhill
1a06de42e5 new revision 2015-02-19 23:45:51 -05:00
Chris
d4e85d1d70 Safari: ignore non-tab activation targets 2015-02-19 11:44:51 -07:00
Chris
0a604f8cc7 Safari code review 2015-02-18 21:40:34 -07:00
Chris
f5c807f2ea Safari: better and more reliable setIcon structuring 2015-02-18 21:38:17 -07:00
Chris
1a55ecfbcd Safari: off/disabled version of toolbar icon 
Toolbar icon now dims when on a whitelisted website
 2015-02-18 16:55:36 -07:00
Deathamns
f20372cf73 Remove unused code 2015-02-17 22:05:23 +01:00
gorhill
9669793066 interim version for dev releases 2015-02-16 11:23:16 -05:00
gorhill
eaf9955a7b new version 2015-02-16 07:57:43 -05:00
gorhill
d58004f91a misunderstanding 2015-02-16 06:21:43 -05:00
gorhill
70488274b1 as per comment, this should work well enough 2015-02-15 23:05:50 -05:00
gorhill
81638853bf new revision 2015-02-15 19:00:04 -05:00
Deathamns
3150c286cf Firefox: match Chrome's behavior with frame ids 2015-02-15 19:25:11 +01:00
gorhill
a926eb7ead vAPI not available in here 2015-02-15 12:34:19 -05:00
gorhill
aa01233cfc support for fennec 2015-02-15 12:23:59 -05:00
gorhill
da54ae5726 #795: code review as per @Deathamns feedback 2015-02-15 11:16:48 -05:00
gorhill
ac7a7201cb oops, revert back version, it was just for locally testing 2015-02-15 09:06:16 -05:00
gorhill
42dcfa88b8 this has been unrequired since a while 2015-02-15 09:04:56 -05:00
gorhill
551308455c this fixes #795 2015-02-15 08:12:56 -05:00
gorhill
5ab41b67a9 existing features enhancement = +0.0.1.0 2015-02-15 07:23:23 -05:00
Deathamns
8693ab738d vAPI.sessionId, element-picker dialog as iframe 
vAPI.sessionId - random ID generated every time when a page loads.

Having the dialog in an iframe lowers the chance of interference with the
styling of the page, also avoids using innerHTML (AMO complaint).
 2015-02-14 10:47:04 +01:00
gorhill
71ba590b17 new interim version 2015-02-12 19:25:19 -05:00
Chris
d2cc20ed47 Safari: important improvements to request capturing + fix twitch.tv 
twitch.tv now works out of the box in HTML5 in Safari. Make sure you
disable Flash if you don't get the HTML5 player.
 2015-02-12 16:29:58 -07:00
gorhill
be7b7679f3 #685: code review 2015-02-12 12:25:54 -05:00
gorhill
65cb46c845 #685: code review 2015-02-12 12:25:19 -05:00
Deathamns
bc7434cf5c Chrome: bypass options_ui 2015-02-12 18:15:07 +01:00
gorhill
273dcd763f this fixes #730 2015-02-12 09:24:45 -05:00
Chris
9a75572d8c Minor vapi-common improvement -- cache vAPI in local scope 2015-02-10 14:50:44 -07:00
Chris
a17882a8cc Remove previous Safari overhead; cleanup workarounds from rest of code 2015-02-10 14:24:04 -07:00
Chris
5b16418e60 Safari: don't double inject, and cleanup stray unicode 2015-02-09 22:47:45 -07:00
Chris
6e7f26f925 Safari: just extra precaution 2015-02-09 22:25:13 -07:00
Chris
ac6211f1af Fixes #721; popover works in tabs without explicit URL 2015-02-09 19:31:21 -07:00
Chris
fe28a9edbf Safari: fixes #741. Now only HTTP/S requests are captured 2015-02-09 18:15:52 -07:00
Chris
0acb14c5a0 Safari update link and minor popup improvement 2015-02-09 18:15:52 -07:00
gorhill
ba2962bad6 opera-specific package 2015-02-09 15:23:27 -05:00
gorhill
2146721275 manifest file for Opera 2015-02-08 23:27:43 -05:00
Chris
bb9e590cb0 Safari: fix privileged/non-priveleged messaging 2015-02-06 18:41:13 -07:00
gorhill
863aaa5401 this fixes #685 2015-02-06 10:30:22 -05:00
gorhill
9a6c87d0dd Revert "µBlock logo refinement and browser icon organization" 
This reverts commit e43931f075.
 2015-02-06 07:56:59 -05:00
Chris
e43931f075 µBlock logo refinement and browser icon organization 
This includes a new, refined µBlock logo, rendered more coherently
and consistently for different sizes and display pixel densities.
The Safari build script has been modified to bundle appropriate
resolutions. The Firefox build script was slightly changed to
adhere to the naming convention. The Chrome manifest was
modified/ammended slightly to take advantage of new renderings.
README's beginning has been modified to be nicer and more
minimal.
Other than the logo's slightly refined look and having better
resolution on different browsers and setups, this should have
no effect on the user experience or further development.
 2015-02-06 04:24:25 -07:00
Chris
684dd00e1a Fix version typo 2015-02-05 17:34:53 -07:00
gorhill
7fe1ae611e new revision 2015-02-05 19:29:53 -05:00
Chris
32da7cd1e5 Safari: performance gain via cleanup of overhead, & improves getTabId efficiency 2015-02-05 16:28:10 -07:00
Chris
c9160fa753 Safari: don't be lenient with XHR blocking 2015-02-05 14:14:20 -07:00
Deathamns
c381183570 Firefox: remove unused arguments 2015-02-05 18:05:41 +01:00
Chris
1de656cb4a Fix comment in Safari vAPI 2015-02-04 12:08:19 -07:00
Chris
113b7dde14 Remove Safari sitepatch stuff (closes #633) 2015-02-04 00:06:35 -07:00
gorhill
bbb2d8d1ff move profiling code to platform-specific 2015-02-03 18:40:56 -05:00
Deathamns
43c8d86769 Firefox: fix extension restarting 2015-02-02 11:52:40 +01:00
Chris
2465d28a17 Safari: avoid closures for messaging API 2015-02-01 14:57:25 -07:00
gorhill
77044c6c98 link to relevant jsperf 2015-02-01 12:25:14 -05:00
gorhill
5d0b110aec use static function instead of closure 2015-02-01 10:15:35 -05:00
gorhill
628382bf8a avoid closures when processing messages 2015-02-01 09:03:43 -05:00
Chris
30f1c9ebaf Fix Safari issue (no toolbar icon caused µBlock to break) #639 2015-01-31 21:19:59 -07:00
Chris
7fe8a8dcec Code reformatting, Safari info fix 2015-01-29 21:20:28 -07:00
Deathamns
21b42304fe Firefox: get the version number from the fragment 2015-01-29 14:12:21 +01:00
Chris
acf434f691 Fixes YouTube/ClickToPlugin #615 (*cough* again *cough*) 2015-01-28 13:45:08 -07:00
Deathamns
ee5a023e03 Firefox: don't close popups after user interaction 2015-01-28 21:08:24 +01:00
gorhill
50e621d4ee reality 2015-01-28 12:59:37 -05:00
Chris
a44eac8625 Merge branch 'master' of github.com:gorhill/uBlock 2015-01-27 22:44:29 -07:00
Chris
5a4f1b57cc Safari fixes and code reformatting 2015-01-27 22:39:55 -07:00
Deathamns
a8b33a4a45 Doesn't work 2015-01-27 22:05:01 +01:00
Chris
a51a2666a9 Merge branch 'master' of github.com:gorhill/uBlock 2015-01-27 12:36:39 -07:00
Chris
b600ded89f Fix YouTube patch 2015-01-27 12:36:19 -07:00
Deathamns
9030bc6e53 Firefox: use correct data for parentFrameId 2015-01-27 17:56:04 +01:00
Deathamns
9bd31f1362 Firefox: each frame should have a unique ID 2015-01-27 16:37:02 +01:00
Deathamns
f9109d7460 Firefox: remove evalInSandbox 
Probably we won't eval plain text code, which makes it unnecessary, also
this way the validator on AMO won't complain about it.
 2015-01-27 13:31:17 +01:00
Deathamns
7f877e64a3 Firefox: add localized descriptions to install.rdf 2015-01-27 12:44:35 +01:00
Deathamns
d24263aa17 Firefox: vAPI.tabs.onNavigation() for about: pages 2015-01-27 11:13:33 +01:00
Deathamns
4a21d49313 Update frameModule.js 2015-01-26 20:38:22 +01:00
Deathamns
263b756764 Firefox: behind-the-scene requests / non-http tabs 2015-01-26 20:26:45 +01:00
Chris
16f3a205e0 Big fixes to Safari vAPI stuff 2015-01-25 00:43:39 -07:00
gorhill
da7398d585 this probably fixes #595 2015-01-24 17:17:44 -05:00
gorhill
8088fa08ff Merge branch 'master' of github.com:gorhill/uBlock into fix-475 2015-01-24 08:17:31 -05:00
gorhill
c3765cbc5b new version 2015-01-23 16:22:29 -05:00
gorhill
1a5a42238e do not rely on core to do the transposition 2015-01-23 13:09:26 -05:00
gorhill
673b8774be this fixes #582 2015-01-23 11:32:49 -05:00
gorhill
4b2dced6f4 Merge branch 'master' of github.com:gorhill/uBlock into fix-475 2015-01-21 12:25:12 -05:00
Deathamns
631da229f5 Firefox: initialize when hiddenDOMWindow is ready 
Probably not the best way to detect its readiness, but it works for now.
This fix should solve the incompatibility with the StartupMaster add-on.
 2015-01-21 18:15:55 +01:00
gorhill
7b8392ca48 more fixes for #105 2015-01-21 11:13:32 -05:00
gorhill
4f2bd14ce6 code review 2015-01-21 09:25:12 -05:00
gorhill
4edfae4b94 code review: jshint'ed 2015-01-21 08:59:23 -05:00
gorhill
255c68baa4 this fixes #536 2015-01-20 19:39:13 -05:00
gorhill
b8131943c9 Merge branch 'master' of github.com:gorhill/uBlock into fix-475 2015-01-20 16:53:42 -05:00
Chris
4901b11fae Doh 2015-01-20 00:44:04 -07:00
Chris
03668551c2 More fixes and performance improvements to Safari event handling and dispatching 2015-01-20 00:35:02 -07:00
gorhill
fdaec4b421 new version 2015-01-19 20:30:27 -05:00
gorhill
7f78ce2260 bring up to date with master 2015-01-19 18:45:00 -05:00
gorhill
759a156e24 started work on #105, #475, and possibly #510 2015-01-19 18:42:58 -05:00
Chris
a65b63ca85 Fix equality (change to strict) 2015-01-19 10:47:37 -07:00
Chris
15488d7396 Update extension info with update manifest and info to match signing cert 2015-01-19 01:55:24 -07:00
Chris
11bb0e9638 Massive overhaul/fixes to core Safari event capturing 2015-01-19 01:50:10 -07:00
gorhill
5ee417e110 new revision 2015-01-18 22:26:07 -05:00
Chris
5aafafd50d Fix set for Firefox & Safari (don't set non-own properties in for..in loop) 2015-01-18 11:50:20 -07:00
gorhill
ab99683454 new revision + fixed frame parent id 2015-01-17 18:02:45 -05:00
gorhill
df69e22bb9 fixed bad test 2015-01-17 15:52:36 -05:00
gorhill
a4b780acc8 new revision 2015-01-17 07:56:57 -05:00
Chris
e1b5693dd1 Installation directions restructured and Safari Update plist updated 2015-01-16 17:41:48 -07:00
Deathamns
48134d9469 Firefox: minimal effort to support older versions 2015-01-16 11:42:34 +01:00
Deathamns
f6e996c25a Firefox: suppress some "unsafe CPOW usage" message 2015-01-16 09:01:40 +01:00
gorhill
dd0137cc70 new revision 2015-01-15 10:38:12 -05:00
Deathamns
32c7bf854b Firefox: fix tab closing issue (pop-up blocking) 2015-01-15 15:58:14 +01:00
gorhill
97b5ad9ad5 removed unused code for the time being 2015-01-15 08:41:30 -05:00
gorhill
ca77c677d7 not needed 2015-01-15 08:30:38 -05:00
Deathamns
089af13e32 URL handling changes 2015-01-15 13:24:35 +01:00
gorhill
119a98026c code review re #498 2015-01-14 19:43:10 -05:00
gorhill
ee01803419 this fixes one part of #498 2015-01-14 17:45:55 -05:00
Deathamns
511b700517 Firefox: lower popup resize delay 2015-01-14 19:13:27 +01:00
Chris
c255f02f0f Way simplify vAPI closePopup for Safari 2015-01-13 13:55:52 -07:00
Deathamns
7bf0113db9 Firefox: fix tooltip animation 2015-01-13 21:33:26 +01:00
Deathamns
bcc1c0da11 Fix prorblems caused by vAPI.insertHTML 2015-01-13 20:25:10 +01:00
gorhill
31e2b1ac03 Merge branch 'master' of github.com:gorhill/uBlock 2015-01-13 11:55:02 -05:00
gorhill
b436f8e829 this fixes #490 2015-01-13 11:54:54 -05:00
Deathamns
7d2fe49eb0 Fix popup tooltips and sizing for Firefox 2015-01-13 17:20:16 +01:00
Deathamns
b4ea545412 Implement vAPI.insertHTML 
The purpose of this API is basically to satisfy AMO reviewers in the
future, since the use of innerHTML with variables (i.e., not plain text) will
be rejected without any questions.

Since this is not a problem for browsers other than Firefox, they will
use simple innerHTML assignment, however safe-parsing could be implemented
for them too.
 2015-01-13 07:30:07 +01:00
Deathamns
3522f0414d Firefox: remove unloading from vAPI 2015-01-13 07:30:05 +01:00
Deathamns
e0f214961d Miscellaneous changes 2015-01-13 07:30:04 +01:00
Deathamns
a71c967613 Firefox: fixed content scripts? 2015-01-13 07:30:03 +01:00
Deathamns
687d226ce9 Firefox: improvements for content scripts 2015-01-13 07:30:01 +01:00
Deathamns
d0de3d0d72 Firefox,Safari: implement vAPI.tabs.reload 2015-01-13 07:30:00 +01:00
Deathamns
a31c30d55e Firefox: simplify vAPI.app.restart 2015-01-13 07:29:59 +01:00
Deathamns
41ac8ad39f Firefox: workaround for the e10s crash 2015-01-13 07:29:57 +01:00
Deathamns
8a9165daa2 Firefox: blocking improvements / other fixes 
- Implement pop-up blocking
- Support blocking redirected requests
- Fix Local mirroring and inline-script blocking
- Block content on data: and about:blank pages
 2015-01-13 07:29:56 +01:00
Deathamns
05bcc070a9 Firefox: popup size for menu-panel 2015-01-13 07:29:54 +01:00
Deathamns
f0ad21fcf5 Safari: code styling 2015-01-13 07:29:53 +01:00
Deathamns
a8e02d4dfa Firefox: fix copy-paste memory leak 2015-01-13 07:29:51 +01:00
Deathamns
fbd2f74eb5 Firefox: implement vAPI.app.restart 2015-01-13 07:29:50 +01:00
Deathamns
5e55ba772d Code styling 2015-01-13 07:29:49 +01:00
Deathamns
9169388849 Firefox: ownsWeak=true for observers, +minor mods 2015-01-13 07:29:47 +01:00
Deathamns
b8c943d539 Make vAPI.setIcon less Chromium specific 2015-01-13 07:29:46 +01:00
Deathamns
b301ac031e Popup related changes 2015-01-13 07:29:44 +01:00
Deathamns
dbfacad8a6 Firefox: new method for request handling 
Now both nsIContentPolicy and on-http-* observers are used for net request
monitoring.

Reasons:
 - In many cases, nsIContentPolicy.shouldLoad is invoked twice for the same
   resource, because of the speculative parsing.
 - nsIContentPolicy.shouldLoad don't have information about the channel,
   so it can't redirect the request, nor change its headers, however
   on-http-opening-request can.

Also, local mirroring and inline-script blocking has been implemented.
 2015-01-13 07:29:43 +01:00
Deathamns
720794357c Safari: get appinfo from tooltip 2015-01-13 07:29:41 +01:00
Deathamns
7815455aca Fix build scipts' shebang, let -> const 2015-01-13 07:29:40 +01:00
Deathamns
7ade0ec7e8 Firefox: better way to get the messageManager 2015-01-13 07:29:39 +01:00
Deathamns
5c2af95c73 Firefox: proper cleanup for context-menu item 2015-01-13 07:29:37 +01:00
Deathamns
d4b2b81ae8 Firefox: move callback to last call 2015-01-13 07:29:36 +01:00
Deathamns
1bb074211c Firefox: saved prefs were overwritten by defaults 2015-01-13 07:29:34 +01:00
Deathamns
16a7bcb3d8 Firefox: add missing vAPI.onLoadAllCompleted 2015-01-13 07:29:33 +01:00
Deathamns
8a19f32373 Remove duplicate 'use strict'; 2015-01-13 07:29:30 +01:00
Deathamns
85ee514ebc Firefox: improve vAPI.tabs.getTabId 2015-01-13 07:29:28 +01:00
Deathamns
c45b7c75e2 Firefox: implement vAPI.contextMenu 2015-01-13 07:29:26 +01:00
Deathamns
0d28d19a4e Chrome,Safari: fix typo and quotes 2015-01-13 07:29:25 +01:00
Deathamns
782f8d441d Firefox: revert previous change 
Initializing the extension with AddonManager takes too long (at least for
this extension).
When starting the browser, tabs loaded before the extension could, and
because of that, blocking didn't work.
It works better, if it's initialized when the window's DOM is ready.
 2015-01-13 07:29:22 +01:00
Deathamns
e61514b9b1 Firefox,Safari: fill vAPI.app in a different way 
Pass the extension data (name and version) as the fragment of the URL
for the background script, so vAPI.app can be filled without using XHR
to read the manifest files.
 2015-01-13 07:29:21 +01:00
Deathamns
20bd1287cf Firefox: location.host isntead of app.cleanName 2015-01-13 07:29:19 +01:00
Deathamns
ecdee65fda Add license headers, plus some code styling 2015-01-13 07:29:16 +01:00
Deathamns
8bb0d3276b Firefox: minor changes 2015-01-13 07:29:15 +01:00
Deathamns
e20458a00f Firefox: fix script injection 2015-01-13 07:29:14 +01:00
Deathamns
f74f07e092 Firefox: implement vAPI.tabs.injectScript 2015-01-13 07:29:12 +01:00
Deathamns
0e7122edf4 Firefox: 'load' -> 'DOMContentLoaded' 2015-01-13 07:29:11 +01:00
Deathamns
1eb81e4083 Firefox: fix 'main_frame' for e10s 2015-01-13 07:29:09 +01:00
Deathamns
d13769b4a9 Firefox: initialize buttons when DOM is ready 2015-01-13 07:29:07 +01:00
Deathamns
45137c2be9 Firefox: update manifest files when building 2015-01-13 07:29:06 +01:00
Deathamns
ec69a50101 Firefox: observe main_frame requests too 2015-01-13 07:29:05 +01:00
Deathamns
892e2fe45a Firefox: fix styling for toolbar button 2015-01-13 07:29:03 +01:00
Deathamns
cb5d860725 Firefox: implement toolbar button and popup 2015-01-13 07:29:01 +01:00
Deathamns
e4329b7dfe Firefox: blocking and content scripts for e10s 2015-01-13 07:29:00 +01:00
Deathamns
0f771e94d1 Firefox: add basic blocking + some fixes 2015-01-13 07:28:59 +01:00
Deathamns
3c76c61f61 Firefox: partial vAPI.tabs implementation 2015-01-13 07:28:57 +01:00
Deathamns
8297014700 Firefox: implement vAPI.storage via SQLite 2015-01-13 07:28:56 +01:00
Deathamns
98e5645ab5 Firefox: implement content scripts 2015-01-13 07:28:54 +01:00
Deathamns
67f18d023c Initial Firefox port (base, messaging, locales) 2015-01-13 07:28:52 +01:00
gorhill
a617e195fe new revision 2015-01-12 10:12:10 -05:00
Chris
e287e4643f Fix Safari i18n function (default to '' if no localized string found) 2015-01-11 20:37:49 -07:00
Raymond Hill
3982bd6de9 Merge pull request #478 from chrisaljoudi/master 
Safari: remove extra call to popup resize -- now smoother
 2015-01-11 21:43:01 -05:00
gorhill
159159321c bump revision for opera version 2015-01-11 21:41:26 -05:00
Chris
1c60434977 Safari: remove extra call to popup resize -- now smoother 2015-01-11 19:37:10 -07:00
gorhill
b5d8c0ed52 standard comment header 2015-01-11 21:18:24 -05:00
Chris
0bd245803f Abstract out platform-specific popup UI JavaScript 2015-01-11 19:07:25 -07:00
Chris
b57d04231d Merge branch 'master' of github.com:gorhill/uBlock 2015-01-11 18:41:38 -07:00