From 464cab3d0405c0906fb5c7333ab6dbb72e8b7971 Mon Sep 17 00:00:00 2001 From: Stephen Smith Date: Tue, 1 Dec 2020 18:36:11 -0500 Subject: [PATCH 1/2] Add Conduit to Custom communication systems --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 14a0b43e..e60e358a 100644 --- a/README.md +++ b/README.md @@ -248,6 +248,7 @@ _See https://en.wikipedia.org/wiki/Comparison_of_CalDAV_and_CardDAV_implementati - [Centrifugo](https://github.com/centrifugal/centrifugo) - Language-agnostic real-time messaging (Websocket or SockJS) server. ([Demo](https://github.com/centrifugal/centrifugo#demo)) `MIT` `Go` - [Cherry](https://github.com/rafael-santiago/cherry) - Tiny webchat server. `GPL-2.0` `Go` +- [Conduit](https://conduit.rs/) - A simple, fast, and reliable chat server written in Rust. ([Source Code](https://gitlab.com/famedly/conduit)) `Apache-2.0` `Rust` - [Darkwire.io](https://darkwire.io/) - End-to-end encrypted instant web chat. ([Source Code](https://github.com/darkwire/darkwire.io)) `MIT` `Nodejs` - [Freenet](https://freenetproject.org/index.html) - Anonymously share files, browse and publish "freesites" (web sites accessible only through Freenet) and chat on forums. ([Source Code](https://github.com/freenet/fred)) `GPL-2.0` `Java` - [Friends](http://moose-team.github.io/friends/) - P2P chat powered by the web. ([Source Code](https://github.com/moose-team/friends)) `MIT` `Nodejs` From fe0d69f505bcd5e808eeaec72f9b430458537097 Mon Sep 17 00:00:00 2001 From: nodiscc Date: Wed, 16 Dec 2020 18:03:57 +0000 Subject: [PATCH 2/2] update conduit description (powered by Matrix) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e60e358a..f33b2b8f 100644 --- a/README.md +++ b/README.md @@ -248,7 +248,7 @@ _See https://en.wikipedia.org/wiki/Comparison_of_CalDAV_and_CardDAV_implementati - [Centrifugo](https://github.com/centrifugal/centrifugo) - Language-agnostic real-time messaging (Websocket or SockJS) server. ([Demo](https://github.com/centrifugal/centrifugo#demo)) `MIT` `Go` - [Cherry](https://github.com/rafael-santiago/cherry) - Tiny webchat server. `GPL-2.0` `Go` -- [Conduit](https://conduit.rs/) - A simple, fast, and reliable chat server written in Rust. ([Source Code](https://gitlab.com/famedly/conduit)) `Apache-2.0` `Rust` +- [Conduit](https://conduit.rs/) - A simple, fast, and reliable chat server powered by Matrix. ([Source Code](https://gitlab.com/famedly/conduit)) `Apache-2.0` `Rust` - [Darkwire.io](https://darkwire.io/) - End-to-end encrypted instant web chat. ([Source Code](https://github.com/darkwire/darkwire.io)) `MIT` `Nodejs` - [Freenet](https://freenetproject.org/index.html) - Anonymously share files, browse and publish "freesites" (web sites accessible only through Freenet) and chat on forums. ([Source Code](https://github.com/freenet/fred)) `GPL-2.0` `Java` - [Friends](http://moose-team.github.io/friends/) - P2P chat powered by the web. ([Source Code](https://github.com/moose-team/friends)) `MIT` `Nodejs`