fix conflicts

This commit is contained in:
Samuel Shifterovich
2018-12-23 17:56:51 +01:00
8 changed files with 89 additions and 71 deletions

View File

@ -93,6 +93,7 @@
<a class="dropdown-item" href="{{prefix}}#social">Decentralized Social Networks</a>
<a class="dropdown-item" href="{{prefix}}#dns">Domain Name System (DNS)</a>
<a class="dropdown-item" href="{{prefix}}#search">Privacy Respecting Search Engines</a>
<a class="dropdown-item" href="{{prefix}}#host">Secure Hosting Providers</a>
</div>
</li>
<li class="nav-item dropdown">