vern
/
website
4
4
Fork 4
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 

Signed-off-by: Skylar "The Cobra" Widulski <cobra@vern.cc>
This commit is contained in:
Skylar "The Cobra" Widulski 2022-12-22 21:28:50 -05:00
parent 1fee305637 e3b33d6c02
commit df0fb68b68
Signed by: cobra
GPG Key ID: 4FD8F812083FF6F9
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
en/index.html
View File

@ -29,19 +29,19 @@
<p>We make use of bridging so you can chat with us regardless of what chat program you use</p>
<div class=h><b id=mainchat>Main Chat:</b> <a aria-hidden=true href=#mainchat>#mainchat</a></div>
<ul>
<li><a href="//mto.vern.cc/#/#vern:vern.cc" target="_blank">Matrix</a></li>
<li><a href='//mto.vern.cc/#/#vern:vern.cc' target="_blank">Matrix</a></li>
<li><a href="xmpp:vern@muc.vern.cc" target="_blank">XMPP</a></li>
<li><a href="ircs://irc.tilde.chat:6697/#vern" target="_blank">IRC (tilde.chat network)</a></li>
</ul>
<div class=h><b id=offtopic>Off-Topic Chat:</b> <a aria-hidden=true href=#offtopic>#offtopic</a></div>
<ul>
<li><a href="//mto.vern.cc/#/#chat:vern.cc" target="_blank">Matrix</a></li>
<li><a href='//mto.vern.cc/#/#chat:vern.cc' target="_blank">Matrix</a></li>
<li><a href="xmpp:chat@muc.vern.cc" target="_blank">XMPP</a></li>
<li><a href="ircs://irc.tilde.chat:6697/#vern-chat" target="_blank">IRC (tilde.chat network)</a></li>
</ul>
<div class=h><b id=abusereport>Abuse Report:</b> <a aria-hidden=true href=#abusereport>#abusereport</a></div>
<ul>
<li><a href="//mto.vern.cc/#/#abuse:vern.cc" target="_blank">Matrix</a></li>
<li><a href='//mto.vern.cc/#/#abuse:vern.cc' target="_blank">Matrix</a></li>
<li><a href="xmpp:abuse@muc.vern.cc" target="_blank">XMPP</a></li>
</ul>
<div class=h><h2 id=sysinfo>What computers do ~vern servers run on?</h2> <a aria-hidden=true href=#sysinfo>#sysinfo</a></div>

4
en/services.html
View File

@ -67,7 +67,11 @@
<li><a href=//bloat.vern.cc>BloatFE (Mastodon Acc Needed)</a> - A web client for Mastodon Network</li>
<li><a href=ssh://vern.cc:2221>Devzat (Seperate Sign-Up)</a> - Chat over ssh!</li>
<li><a href=//jitsi.vern.cc>Jitsi (Reg needed)</a> - Free video conferencing software for web &amp; mobile</li>
<<<<<<< HEAD
<li><a href="//wiki.vern.cc/doku.php?id=matrix">Matrix (Reg needed)</a> - A network for secure, decentralized communication</li>
=======
<li><a href=//wiki.vern.cc/doku.php?id=matrix>Matrix (Reg needed)</a> - A network for secure, decentralized communication</li>
>>>>>>> e3b33d6c0238163b0c75ce12f845884a8ca3db8b
<li><a href="//wiki.vern.cc/doku.php?id=matrix#xmpp_bridge">Bifrost</a> - XMPP &lt;-&gt; Matrix Bridge</li>
<li><a href=//cn.vern.cc>Cinny</a> (AD: <a href=//cinny.vern.cc>A</a>) - Yet another Matrix client</li>
<li><a href=//riot.vern.cc>Element</a> - Secure collaboration and messaging</li>