Merge branch 'master' into 'master'


See merge request linuxcafefederation/awesome-alternatives!1
This commit is contained in:
TheMainOne 2020-08-17 18:33:08 +00:00
commit 0d8a9c0393
1 changed files with 3 additions and 3 deletions

View File

@ -1,7 +1,7 @@
# Awesome Alternatives [![Awesome](]( [![Awesome Humane Tech](]( [![delightful](](
A curated list of mostly [*free* and open source]( alternatives to [proprietary software]( and services. Some of the software below has proprietary backend, and only the application or the frontend the user interacts with is open source.
## [Social media](
### [PeerTube]( [![Generic badge](]( [![Generic badge](](
@ -40,13 +40,13 @@ A curated list of mostly [*free* and open source](
*Alternative to Discord* — Matrix is an open standard and lightweight protocol for real-time communication. It is designed to allow users with accounts at one communications service provider to communicate with users of a different service provider via online chat, voice over IP, and videotelephony. The most popular way to interact with matrix is through [Riot](
*Text from [Wikipedia](*
*Text from [Wikipedia](*
### [Jami](
*Alternative to Discord/WhatsApp* — Jami is a SIP-compatible distributed peer-to-peer softphone and SIP-based instant messenger for Linux, Microsoft Windows, OS X, iOS, and Android. Developed and maintained by the Canadian company Savoir-faire Linux, and with the help of a global community of users and contributors, Jami positions itself as a potential free Skype replacement.
*Text from [Wikipedia](*
*Text from [Wikipedia](*
### [Mattermost]( [![Generic badge](](