Mercurial > hg > anonet-resdb
comparison doc/www.anonet2.org/public_pod/index.pod @ 183:eed932f2ea7f draft
Merge git://1.0.49.10
Conflicts:
doc/www.anonet2.org/public_pod/index.pod
author | Nick <nick@somerandomnick.ano> |
---|---|
date | Thu, 14 Oct 2010 03:01:24 +0000 |
parents | b2de877ee4a9 a4b6adae5f0e |
children | e49a9157c13e |
comparison
equal
deleted
inserted
replaced
181:91a0f3fd54b7 | 183:eed932f2ea7f |
---|---|
263 | 263 |
264 =over | 264 =over |
265 | 265 |
266 =item * | 266 =item * |
267 | 267 |
268 Webchat (looking to relay to IRC, L<http://www.sevilnatas.ano/chat/>) | |
269 | |
270 =item * | |
271 | |
268 L<WikiLeaks Mirror|http://wikileaks.ucis.ano/> (The real WikiLeaks may be down, but not our mirror!) | 272 L<WikiLeaks Mirror|http://wikileaks.ucis.ano/> (The real WikiLeaks may be down, but not our mirror!) |
269 | 273 |
270 =item * | 274 =item * |
271 | 275 |
272 L<Some Random Wiki|http://www.somerandomwiki.ano/> | 276 L<Some Random Wiki|http://www.somerandomwiki.ano/> |