From 1ac81d93789a16b4a9aca66a41f5d3972d4b064c Mon Sep 17 00:00:00 2001 From: "Skylar \"The Cobra\" Widulski" Date: Thu, 22 Dec 2022 21:33:36 -0500 Subject: [PATCH] Oops forgot to actually merge Signed-off-by: Skylar "The Cobra" Widulski --- en/services.html | 4 ---- 1 file changed, 4 deletions(-) diff --git a/en/services.html b/en/services.html index 5e15ee1..afc1e4e 100644 --- a/en/services.html +++ b/en/services.html @@ -67,11 +67,7 @@
  • BloatFE (Mastodon Acc Needed) - A web client for Mastodon Network
  • Devzat (Seperate Sign-Up) - Chat over ssh!
  • Jitsi (Reg needed) - Free video conferencing software for web & mobile
    • -<<<<<<< HEAD
  • Matrix (Reg needed) - A network for secure, decentralized communication
    • -======= -
  • Matrix (Reg needed) - A network for secure, decentralized communication
    • ->>>>>>> e3b33d6c0238163b0c75ce12f845884a8ca3db8b
  • Bifrost - XMPP <-> Matrix Bridge
  • Cinny (AD: A) - Yet another Matrix client
  • Element - Secure collaboration and messaging