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 4684647d43 - Show all commits

View File

@@ -107,7 +107,7 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
<span class="no-text-wrap"> <span class="no-text-wrap">
DoH, DoH,
<span data-toggle="tooltip" data-placement="bottom" data-original-title="Supports port 443 in addition to 853"> <span data-toggle="tooltip" data-placement="bottom" data-original-title="Supports port 443 in addition to 853">
<strong>DoT</strong>, DoT <span class="fas fa-info-circle fa-sm text-secondary"></span>,
</span> </span>
</span> </span>
DNSCrypt DNSCrypt
@@ -195,7 +195,7 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
<span class="no-text-wrap"> <span class="no-text-wrap">
DoH, DoH,
<span data-toggle="tooltip" data-placement="bottom" data-original-title="Supports port 443 in addition to 853"> <span data-toggle="tooltip" data-placement="bottom" data-original-title="Supports port 443 in addition to 853">
<strong>DoT</strong>, DoT <span class="fas fa-info-circle fa-sm text-secondary"></span>,
</span> </span>
</span> </span>
DNSCrypt DNSCrypt
@@ -227,7 +227,7 @@ github="https://github.com/jedisct1/dnscrypt-proxy"
<span class="no-text-wrap"> <span class="no-text-wrap">
DoH, DoH,
<span data-toggle="tooltip" data-placement="bottom" data-original-title="Supports port 443 in addition to 853"> <span data-toggle="tooltip" data-placement="bottom" data-original-title="Supports port 443 in addition to 853">
<strong>DoT</strong> DoT <span class="fas fa-info-circle fa-sm text-secondary"></span>
</span> </span>
</span> </span>
</td> </td>