Merge branch 'master' into i18n

This commit is contained in:
2019-08-11 21:47:56 -05:00
29 changed files with 595 additions and 95 deletions

View File

@ -61,6 +61,8 @@ permalink: /classic/
{% include sections/social-networks.html %}
{% include sections/social-news-aggregator.html %}
{% include sections/dns.html %}
{% include sections/notebooks.html %}

View File

@ -0,0 +1,8 @@
---
layout: page
permalink: /providers/social-news-aggregator/
title: "Social News Aggregator"
description: "Stay up-to-date with privacy-respecting online bulletin boards."
---
{% include sections/social-news-aggregator.html %}

View File

@ -0,0 +1,8 @@
---
layout: page
permalink: /software/teamchat/
title: "Team chat"
description: "Discover secure and private ways to communicate with your team online without letting any third parties read your messages."
---
{% include sections/teamchat.html %}