summaryrefslogtreecommitdiffstats
path: root/index.html
diff options
context:
space:
mode:
authorPratyush Desai2021-08-07 05:35:03 +0200
committerPratyush Desai2021-08-07 05:35:03 +0200
commit3fb489fbd402f749d0c0b5359fc6dac00c84c2af (patch)
treea286ea8bf76906b7b314b082542fb261d5d1cc67 /index.html
parent184dbc8811196b61f8be9ba5c8471a541b0be8bb (diff)
parentd2508005c40cefc22521c4bfa4e4cd656a535c50 (diff)
downloadwebsite-3fb489fbd402f749d0c0b5359fc6dac00c84c2af.tar.gz
website-3fb489fbd402f749d0c0b5359fc6dac00c84c2af.tar.bz2
website-3fb489fbd402f749d0c0b5359fc6dac00c84c2af.zip
Merge pull request 'Adding git.html' (#11) from devel_git into master
Reviewed-on: https://git.com.de/LibertaCasa/website/pulls/11 good luck!
Diffstat (limited to 'index.html')
-rw-r--r--index.html7
1 files changed, 6 insertions, 1 deletions
diff --git a/index.html b/index.html
index 15bda3b..9e559e8 100644
--- a/index.html
+++ b/index.html
@@ -28,6 +28,7 @@ There is a focus on supporting <a href="https://en.wikipedia.org/wiki/Free_and_o
You can also visit us over The Onion Routing protocol at <a href="http://qzzf2qcfbhievvs5nzkccuwddroipy62qjocqtmgcgh75vd6w57m7yad.onion">our onion address.</a>
+Contribute: <a href="git.html">/git</a>
Donts:
======
@@ -56,6 +57,9 @@ Communcations:
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>
@@ -72,6 +76,7 @@ Services:
<footer>
<a href="mailto:hello@liberta.casa"> Contact </a>
</footer>
+>>>>>>> master
</pre>
</body>
-</html> \ No newline at end of file
+</html>