Merge upstream commits into main

This commit is contained in:
Jonah Aragon 2021-01-15 04:28:31 -06:00
commit 05ad5939da
No known key found for this signature in database
GPG key ID: 6A957C9A9A9429F7
14 changed files with 23 additions and 35 deletions

View file

@ -95,7 +95,7 @@ We also log how many times this or that tracker has been blocked. We need this i
<td>
<div
class="btn-secondary btn-icon"
title="&quot;No logs.&quot;"
data-original-title="&quot;No logs.&quot;"
data-toggle="tooltip"
data-placement="bottom">
<span class="fas fa-globe"></span>
@ -186,7 +186,7 @@ We also log how many times this or that tracker has been blocked. We need this i
<td>
<div
class="btn-secondary btn-icon"
title="&quot;CZ.NIC resolvers neither collect any personal data nor gather information on pages where your computer sends personal data.&quot;"
data-original-title="&quot;CZ.NIC resolvers neither collect any personal data nor gather information on pages where your computer sends personal data.&quot;"
data-toggle="tooltip"
data-placement="bottom">
<span class="fas fa-globe"></span>
@ -507,7 +507,7 @@ We also log how many times this or that tracker has been blocked. We need this i
<td>
<div
class="btn-secondary btn-icon"
title="&quot;Absolutely nothing is being logged, neither about the users nor the usage of this service. I do keep graphs of the total number of queries, but no personally identifiable information is saved. The data that is saved will never be sold or used for anything except capacity planning of the service.&quot;"
data-original-title="&quot;Absolutely nothing is being logged, neither about the users nor the usage of this service. I do keep graphs of the total number of queries, but no personally identifiable information is saved. The data that is saved will never be sold or used for anything except capacity planning of the service.&quot;"
data-toggle="tooltip"
data-placement="bottom">
<span class="fas fa-globe"></span>