This commit is contained in:
Burung Hantu 2015-07-10 03:03:59 +02:00
parent 333b4d3881
commit 7d8e3a08b8

View File

@ -627,11 +627,7 @@ Chrome on iOS, Internet Explorer and Safari does not implement <a href="https://
<img src="img/addons/uBlock.gif" class="img-responsive pull-left" alt="uBlock" style="margin-right:30px;">
<p><strong>uBlock Origin</strong> is an lightweight and efficient blocker: easy on memory and CPU footprint. The extension has no monetization strategy and development is volunteered. OS: Firefox, Safari, Opera, Chromium. AdBlock Plus is not recommended because they show "acceptable ads". The system behind that white list is lacking transparency.
<br />
<<<<<<< HEAD
<a href="https://addons.mozilla.org/en/firefox/addon/ublock-origin/" target="_blank">https://addons.mozilla.org/en/firefox/addon/ublock-origin/</a>
=======
<a href="https://addons.mozilla.org/en/firefox/addon/ublock-origin/" target="_blank">https://addons.mozilla.org/de/firefox/addon/ublock-origin/</a>
>>>>>>> origin/master
</p>