Git-Mirrors/privacyguides.org
1
0
Fork 0
mirror of https://github.com/privacyguides/privacyguides.org.git synced 2025-01-19 20:11:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
Conflicts:
	index.html
This commit is contained in:
Burung Hantu 2015-07-09 10:38:24 +02:00
commit 19cc0acf07
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
index.html
View File

@ -627,7 +627,11 @@ 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>
@ -1912,4 +1916,4 @@ It's important for a website like privacytools.io to be up-to-date. Keep an eye
<script> $(function () { $("[data-toggle='tooltip']").tooltip(); }); </script>
</body>
</html>
</html>