Merge branch 'master' into i18n

This commit is contained in:
djoate
2019-11-02 02:09:50 -04:00
127 changed files with 2586 additions and 1382 deletions

View File

@ -6,16 +6,6 @@
<div class="container-fluid">
<div class="row mb-2">
<div class="col-lg-3 col-sm-12 pt-lg-5">
<img src="/assets/img/addons/Blokada.png" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="Blokada">
</div>
<div class="col">
<h3>{% t android_addons.block_ads %} <a href="https://blokada.org/">Blokada</a></h3>
<p><strong>Blokada</strong> {% t android_addons.blokada %}
</div>
</div>
<div class="row mb-2">
<div class="col-lg-3 col-sm-12 pt-lg-5">
<img src="/assets/img/addons/netguard.png" height="70" width="200" class="img-fluid d-block mr-auto ml-auto align-middle" alt="NetGuard">
@ -37,3 +27,11 @@
</div>
</div>
<h2>See also</h2>
<ul>
<li>
<a href="/providers/dns#clients">Our DNS page</a> which also has information on encrypting DNS on Android.
</li>
</ul>