summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPratyush Desai2021-08-07 09:02:18 +0530
committerPratyush Desai2021-08-07 09:02:18 +0530
commitd2508005c40cefc22521c4bfa4e4cd656a535c50 (patch)
treea286ea8bf76906b7b314b082542fb261d5d1cc67
parentcc94c6e8971b3204a53a10c6ca265585d2c3158a (diff)
parent184dbc8811196b61f8be9ba5c8471a541b0be8bb (diff)
downloadwebsite-d2508005c40cefc22521c4bfa4e4cd656a535c50.tar.gz
website-d2508005c40cefc22521c4bfa4e4cd656a535c50.tar.bz2
website-d2508005c40cefc22521c4bfa4e4cd656a535c50.zip
merge conflict
-rw-r--r--i2p.html15
-rw-r--r--index.html21
-rw-r--r--irc.html13
-rw-r--r--matrix.html14
-rw-r--r--styles.css6
-rw-r--r--xmpp.html13
6 files changed, 80 insertions, 2 deletions
diff --git a/i2p.html b/i2p.html
index 4ba7551..9a9db4f 100644
--- a/i2p.html
+++ b/i2p.html
@@ -49,6 +49,21 @@ You should now be able to connect your IRC client with the following settings:
SSL/TLS: Off/Disabled
</code>
Nickname, Username and SASL password are the regular details you would use for connecting to LibertaCasa.
+
+
+
+
+
+
+
+
+
+
+
+
+<footer>
+ <a href="mailto:hello@liberta.casa"> Contact </a>
+</footer>
</pre>
</body>
</html>
diff --git a/index.html b/index.html
index 50a460c..9e559e8 100644
--- a/index.html
+++ b/index.html
@@ -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>
diff --git a/irc.html b/irc.html
index 57e0739..e1e7584 100644
--- a/irc.html
+++ b/irc.html
@@ -112,6 +112,19 @@ in place of your cloaked IP-based hostname).
+
+
+
+
+
+
+
+
+
+
+<footer>
+ <a href="mailto:hello@liberta.casa"> Contact </a>
+</footer>
</pre>
</body>
</html>
diff --git a/matrix.html b/matrix.html
index 068979f..6326849 100644
--- a/matrix.html
+++ b/matrix.html
@@ -19,6 +19,20 @@
<a href="https://element.liberta.casa">Matrix WebClient</a>
+
+
+
+
+
+
+
+
+
+
+
+<footer>
+ <a href="mailto:hello@liberta.casa"> Contact </a>
+</footer>
</pre>
</body>
</html>
diff --git a/styles.css b/styles.css
index 9414957..489bd8c 100644
--- a/styles.css
+++ b/styles.css
@@ -9,5 +9,9 @@ a {
}
a:hover {
- background-color: blue;
+ background-color: rgb(130, 100, 185);
+}
+
+footer {
+ color: green;
} \ No newline at end of file
diff --git a/xmpp.html b/xmpp.html
index 4ad24bd..ab6ca24 100644
--- a/xmpp.html
+++ b/xmpp.html
@@ -33,6 +33,19 @@ and the password of your choice.
Host: xmpp.liberta.casa
Port: 5222
+
+
+
+
+
+
+
+
+
+
+<footer>
+ <a href="mailto:hello@liberta.casa"> Contact </a>
+</footer>
</pre>
</body>
</html>