Merge branch 'master' into i18n

This commit is contained in:
2019-08-11 22:39:01 -05:00
10 changed files with 51 additions and 38 deletions

View File

@ -1,8 +0,0 @@
---
layout: page
permalink: /software/im/
title: "Instant Messaging"
description: "Discover secure and private ways to message others online without letting any third parties read your messages."
---
{% include sections/instant-messenger.html %}

View File

@ -0,0 +1,16 @@
---
layout: page
permalink: /software/real-time-communication/
title: "Real-Time Communication"
description: "Discover secure and private ways to communicate with others online without letting any third parties read your messages."
---
{% include sections/instant-messenger.html %}
<hr/>
{% include sections/voice-video-messenger.html %}
<hr/>
{% include sections/teamchat.html %}

View File

@ -1,8 +0,0 @@
---
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 %}

View File

@ -1,8 +0,0 @@
---
layout: page
permalink: /software/voip/
title: "VoIP"
description: "Find a voice and video messenger that supports completely End-to-End encrypted calls."
---
{% include sections/voice-video-messenger.html %}