-- Leo's gemini proxy
-- Connecting to git.thebackupbox.net:1965...
-- Connected
-- Sending request
-- Meta line: 20 text/gemini
repo: resdb action: commit revision: path_from: revision_from: 0a745779ffd160ff77dbba359fc077ce8a83270a: path_to: revision_to:
commit 0a745779ffd160ff77dbba359fc077ce8a83270a Merge: 3ab900b 38fdf66 Author: root <root@HAL2000.(none)> Date: Tue Oct 26 18:13:42 2010 -0500 Merge branch 'master' of git://git1.somerandomnick.ano Conflicts: doc/www.anonet2.org/public_pod/index.pod diff --cc doc/www.anonet2.org/public_pod/index.pod index 1895d7fd23f00364295760cf3e7ff622b3983943,9fc773352ec3b3a514ff2d9863d7a19699013351..bbc9a337960dc15eafca38559ed42ef90a316d1b --- a/doc/www.anonet2.org/public_pod/index.pod +++ b/doc/www.anonet2.org/public_pod/index.pod @@@ -20,24 -20,16 +20,28 @@@ us and chat, it's very easy =over =item webchat + L<KwaakNet|http://anortr.ucis.nl:8086/?channels=anonet&nick=Anonymous> (anonymous) ++<<<<<<< HEAD +L<sevilNatas (KwaakNet)|http://www.sevilnatas.ano/chat.html> (automatically hide your identity) + +=item webchat + +L<KwaakNet|http://anortr.ucis.nl:8086/?channels=anonet&nick=Anonymous> (partially hides your identity) + +=item webchat + +L<KwaakNet|http://webchat.kwaaknet.org/?c=AnoNet> (doesn't hide your identity) ++======= + L<KwaakNet|http://webchat.kwaaknet.org/?c=AnoNet> (not anonymous) ++>>>>>>> 38fdf66238d67bb4e04b57e19bdcb4507c23c313 =item IRC chat + L<SRN|irc://anortr.ucis.nl:8804/RendezVous> (hides your identity) - L<SRN|telnet://ufo-net.nl:2324/> (hides your identity) + L<UFO|irc://anortr.ucis.nl:8805/anonet> (hides your identity) - =item IRC chat - - L<UFO|telnet://ufo-net.nl:2325/> (partly hides your identity) + L<KwaakNet|irc://irc.kwaaknet.org:6667/anonet> (doesn't hide your identity) =item telnet chat @@@ -57,7 -45,9 +57,13 @@@ Once you're online, you can reconnect t =item webchat ++<<<<<<< HEAD +L<KwaakNet|http://1.3.3.2:8086/?channels=anonet&nick=Anonymous> (partially hides your identity) ++======= + L<KwaakNet|http://1.3.3.2:8086/?channels=anonet&nick=Anonymous> (hides your identity) + + L<sevilNatas (KwaakNet)|http://www.sevilnatas.ano/chat.html> (doesn't automatically hide your identity) ++>>>>>>> 38fdf66238d67bb4e04b57e19bdcb4507c23c313 =item IRC
-----END OF PAGE-----
-- Response ended
-- Page fetched on Sun Jun 2 09:52:36 2024