merge conflict

git
Merge branch 'extras'
2021-08-07 09:02:18 +05:30 · 2021-08-07 08:59:52 +05:30 · 2021-07-23 22:58:15 +05:30 · 2021-07-23 22:58:01 +05:30 · 2021-07-23 21:30:43 +05:30 · 2021-07-23 21:30:43 +05:30
6 changed files with 80 additions and 2 deletions
--- 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>
--- 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>
--- 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>
--- 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>
--- 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;
 }
--- 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>
Author	SHA1	Message	Date
Pratyush Desai	d2508005c4	merge conflict	2021-08-07 09:02:18 +05:30
Pratyush Desai	184dbc8811	git	2021-08-07 08:59:52 +05:30
Pratyush Desai	da20d2ccbf	Merge branch 'extras'	2021-07-23 22:58:15 +05:30
Pratyush Desai	47ce276ebe	squash this	2021-07-23 22:58:01 +05:30
Pratyush Desai	95a550cd50	mailto Signed-off-by: Pratyush Desai <pratyushndesai@gmail.com>	2021-07-23 21:30:43 +05:30
Pratyush Desai	a3a5402af2	cytube, jitsi and footers Signed-off-by: Pratyush Desai <pratyushndesai@gmail.com>	2021-07-23 21:30:43 +05:30
Pratyush Desai	4e24e9476f	xmpp instructions Signed-off-by: Pratyush Desai <pratyushndesai@gmail.com>	2021-07-23 21:30:43 +05:30
Pratyush Desai	6b59a040b0	Readme formatting	2021-07-23 21:30:43 +05:30