Merge master into i18n branch #1454

Merged
djoate merged 103 commits from i18n into i18n 2019-11-02 20:43:17 +00:00
Showing only changes of commit 1e71f1aede - Show all commits

View File

@@ -49,7 +49,7 @@
<li><a href="https://retroshare.cc/">RetroShare</a> - Open Source cross-platform, Friend-2-Friend and secure decentralized communication platform.</li>
<li><a href="https://gnunet.org/">GNUnet</a> - GNUnet provides a strong foundation of free software for a global, distributed network that provides security and privacy.</li>
<li><a href="https://ipfs.io/">IPFS</a> <em>and</em> <a href="https://github.com/ipfs-shipyard/ipfs-companion">IPFS Companion</a>- A peer-to-peer hypermedia protocol to make the web faster, safer, and more open. IPFS Companion is a browser extension for redirecting queries to a gateway of your choice (generally local). <a href="https://github.com/privacytoolsIO/privacytools.io/pull/361#issuecomment-344414022">
<span class="badge badge-warning" data-toggle="tooltip" title="">
<span class="badge badge-danger" data-toggle="tooltip" title="">
<span class="fas fa-exclamation-triangle"></span>
Important privacy warning
</span>