diff options
| author | Luke Smith <luke@lukesmith.xyz> | 2021-07-05 19:31:33 -0400 |
|---|---|---|
| committer | Luke Smith <luke@lukesmith.xyz> | 2021-07-05 19:31:33 -0400 |
| commit | d8981b1029ce51a64d0ea6a8f627b0070b9ed8cb (patch) | |
| tree | 7d6159781c89501bd0139c817bd339e6f29afc2c /index.html | |
| parent | 0f2e640ed16fb17f7d2c2ea90bcc848492327b52 (diff) | |
| parent | 0d8a7cc8c787fe15bdab6266f5f9fb50edae27a0 (diff) | |
Merge branch 'master' of git://github.com/reflex229/landchad into reflex229-master
Diffstat (limited to 'index.html')
| -rw-r--r-- | index.html | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -66,6 +66,7 @@ <li><a href="gitea.html">Setting up <img src="pix/gitea.svg">Gitea</a></li> <li><a href="irc.html">Creating your own chat server with <img src="pix/irc.svg">IRC</a></li> <li><a href="rss-bridge.html">RSS Bridge: Create RSS Feeds for Mainstream Social Media</a></li> + <li><a href="calibre.html">Setting up a Calibre library server</a></li> </ul> <h3 id=crypto>Accepting Cryptocurrency Tips</h3> @@ -109,10 +110,17 @@ <ul> <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> +>>>>>>> 0d8a7cc8c787fe15bdab6266f5f9fb50edae27a0 </ul> |