merge conflict

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>

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>

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>

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>

styles.css

@@ -9,5 +9,9 @@ a {
 }
 
 a:hover {
-    background-color: blue;
+    background-color: rgb(130, 100, 185);
+}
+
+footer {
+    color: green;
 }

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>