diff options
| author | root <root@HAL2000.(none)> | 2010-10-26 21:26:17 -0500 |
|---|---|---|
| committer | root <root@HAL2000.(none)> | 2010-10-26 21:26:17 -0500 |
| commit | ba3a6ce7443f675177d6e2cbc7e777b99120da79 (patch) | |
| tree | eb905095cd19bab8fbb72f1689a51e52b8e320bc | |
| parent | 0a745779ffd160ff77dbba359fc077ce8a83270a (diff) | |
| parent | 303adb66a2ac12428a90362187ba7ba6f6822333 (diff) | |
| download | resdb-ba3a6ce7443f675177d6e2cbc7e777b99120da79.tar.gz resdb-ba3a6ce7443f675177d6e2cbc7e777b99120da79.zip | |
Merge branch 'master' of git://git1.somerandomnick.ano
Conflicts:
doc/www.anonet2.org/public_pod/index.pod
| -rw-r--r-- | doc/www.anonet2.org/public_pod/index.pod | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/doc/www.anonet2.org/public_pod/index.pod b/doc/www.anonet2.org/public_pod/index.pod index bbc9a33..f9ee5d5 100644 --- a/doc/www.anonet2.org/public_pod/index.pod +++ b/doc/www.anonet2.org/public_pod/index.pod @@ -23,6 +23,7 @@ us and chat, it's very easy: L<KwaakNet|http://anortr.ucis.nl:8086/?channels=anonet&nick=Anonymous> (anonymous) <<<<<<< HEAD +<<<<<<< HEAD L<sevilNatas (KwaakNet)|http://www.sevilnatas.ano/chat.html> (automatically hide your identity) =item webchat @@ -35,6 +36,9 @@ L<KwaakNet|http://webchat.kwaaknet.org/?c=AnoNet> (doesn't hide your identity) ======= L<KwaakNet|http://webchat.kwaaknet.org/?c=AnoNet> (not anonymous) >>>>>>> 38fdf66238d67bb4e04b57e19bdcb4507c23c313 +======= +L<KwaakNet|http://webchat.kwaaknet.org/?c=AnoNet> (not anonymous) +>>>>>>> 303adb66a2ac12428a90362187ba7ba6f6822333 =item IRC chat L<SRN|irc://anortr.ucis.nl:8804/RendezVous> (hides your identity) @@ -58,12 +62,18 @@ Once you're online, you can reconnect to IRC from inside AnoNet: =item webchat <<<<<<< HEAD +<<<<<<< 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 +======= +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) +>>>>>>> 303adb66a2ac12428a90362187ba7ba6f6822333 =item IRC |