diff options
| author | Pratyush Desai | 2021-08-07 09:02:18 +0530 |
|---|---|---|
| committer | Pratyush Desai | 2021-08-07 09:02:18 +0530 |
| commit | d2508005c40cefc22521c4bfa4e4cd656a535c50 (patch) | |
| tree | a286ea8bf76906b7b314b082542fb261d5d1cc67 /index.html | |
| parent | cc94c6e8971b3204a53a10c6ca265585d2c3158a (diff) | |
| parent | 184dbc8811196b61f8be9ba5c8471a541b0be8bb (diff) | |
| download | website-d2508005c40cefc22521c4bfa4e4cd656a535c50.tar.gz website-d2508005c40cefc22521c4bfa4e4cd656a535c50.tar.bz2 website-d2508005c40cefc22521c4bfa4e4cd656a535c50.zip | |
merge conflict
Diffstat (limited to 'index.html')
| -rw-r--r-- | index.html | 21 |
1 files changed, 20 insertions, 1 deletions
@@ -52,12 +52,31 @@ Services: Communcations: -------------- -<a href="/xmpp.html">XMPP</a> | <a href="/matrix.html">Matrix</a> | <a href="/irc.html">IRC</a> +<a href="/xmpp.html">XMPP</a> | <a href="/matrix.html">Matrix</a> | <a href="/irc.html">IRC</a> | <a href="https://meet.lysergic.dev"> Jitsi Video Conferencing </a> Services: --------- +<<<<<<< HEAD <a href="https://pasta.lysergic.dev">Private Bin</a> | <a href="https://git.com.de">Gitea</a> | <a href="https://searx.xkek.net"> Searx search </a> | <a href="https://yacy.xkek.net"> Yacy Search</a> +======= +<a href="https://pasta.lysergic.dev">Private Bin</a> | <a href="https://git.com.de">Gitea</a> | <a href="https://searx.xkek.net"> Searx search </a> | <a href="https://yacy.xkek.net"> Yacy Search </a> | <a href="https://party.lysergic.dev"> Cytube - Watch together</a> + + + + + + + + + + + + +<footer> + <a href="mailto:hello@liberta.casa"> Contact </a> +</footer> +>>>>>>> master </pre> </body> </html> |