diff options
| author | Luke Smith <luke@lukesmith.xyz> | 2021-08-03 13:53:54 -0400 |
|---|---|---|
| committer | Luke Smith <luke@lukesmith.xyz> | 2021-08-03 13:53:54 -0400 |
| commit | 051cd61f4bc5caf8a3be4fb32bf255f297ecd217 (patch) | |
| tree | f2235356fb50362c33114266efd182eacbb16d35 /index.html | |
| parent | 210ee55fe7bd4daef976e8bbcb9dc75a0302d2c5 (diff) | |
| parent | 08c59ec7ac42bca77daf4d86651726529b6783c4 (diff) | |
Merge branch 'reflex229-master'
Diffstat (limited to 'index.html')
| -rw-r--r-- | index.html | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -114,16 +114,13 @@ <li><a href="https://btcpayserver.org/">BTCPay</a></li> <li>Email webclients</li> <li>Simple static site generators</li> -<<<<<<< HEAD - <li>Calibre (library server)</li> + <li><a href="https://joinpeertube.org/">PeerTube</a> (like YouTube)</li> <li><a href="https://www.ejabberd.im/">XMPP ejabberd</a></li> <li><a href="https://movim.eu/">Movim for XMPP</a></li> -======= <li>Nitter</li> <li>PeerTube (like YouTube)</li> <li>XMPP ejabberd</li> <li>Movim for XMPP</li> ->>>>>>> 4aa7add2b1eaaa4561d5aa43df37bcb991bd73c8 </ul> |