LibertaCasa/website
9
0
Fork 0
Code Issues 4 Pull Requests Releases Wiki Activity

Compare commits

base: LibertaCasa:c730c70d609f3158b6a3226667a53296e2bf606e
Branches Tags
LibertaCasa:master
LibertaCasa:django-devel
LibertaCasa:django
LibertaCasa:hugo
LibertaCasa:devel
LibertaCasa:devel_xmpp
LibertaCasa:devel_content
LibertaCasa:drone
LibertaCasa:devel_git
LibertaCasa:formatting
LibertaCasa:extras
LibertaCasa:xmpp
LibertaCasa:i2p
..
compare: LibertaCasa:d2508005c40cefc22521c4bfa4e4cd656a535c50
Branches Tags
LibertaCasa:master
LibertaCasa:django-devel
LibertaCasa:django
LibertaCasa:hugo
LibertaCasa:devel
LibertaCasa:devel_xmpp
LibertaCasa:devel_content
LibertaCasa:drone
LibertaCasa:devel_git
LibertaCasa:formatting
LibertaCasa:extras
LibertaCasa:xmpp
LibertaCasa:i2p

No commits in common. "c730c70d609f3158b6a3226667a53296e2bf606e" and "d2508005c40cefc22521c4bfa4e4cd656a535c50" have entirely different histories.
c730c70d60 ... d2508005c4

1 changed files with 4 additions and 0 deletions
Show Stats Expand all files Collapse all files

4
index.html
View File

@ -57,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>
@ -73,6 +76,7 @@ Services:
<footer>
<a href="mailto:hello@liberta.casa"> Contact </a>
</footer>
>>>>>>> master
</pre>
</body>
</html>