aboutsummaryrefslogtreecommitdiff
path: root/doc/ikiwikiusers.mdwn
diff options
context:
space:
mode:
authorhttps://social.hi.ato.br/desci <desci@web>2015-06-01 02:50:24 -0400
committeradmin <admin@branchable.com>2015-06-01 02:50:24 -0400
commitd1e01a6a0cb226c8676cc03c3b81db1349867efe (patch)
tree06a3dbb58eb1ae1502ead3e86c3ae42a67c51325 /doc/ikiwikiusers.mdwn
parent5c177cb12545634e41b8c83104c127a03318a10d (diff)
downloadikiwiki-d1e01a6a0cb226c8676cc03c3b81db1349867efe.tar
ikiwiki-d1e01a6a0cb226c8676cc03c3b81db1349867efe.tar.gz
removed old sites and added new
Diffstat (limited to 'doc/ikiwikiusers.mdwn')
-rw-r--r--doc/ikiwikiusers.mdwn10
1 files changed, 8 insertions, 2 deletions
diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn
index 7fa405eeb..47a13692a 100644
--- a/doc/ikiwikiusers.mdwn
+++ b/doc/ikiwikiusers.mdwn
@@ -101,6 +101,8 @@ Projects & Organizations
* [[hplusroadmap|http://diyhpl.us/wiki/]] - a community for open source hardware, do-it-yourself biohacking and practical transhumanism
* [[OpenAFS|http://wiki.openafs.org]] - an open-source, cross-platform distributed file system
* [Copyleft.org](http://copyleft.org/)
+* [Hacklab Independência](https://hi.ato.br) - radical tech collective
+* [Piratas XYZ](http://piratas.xyz) - one of [pirate party of brazil](http://partidopirata.org)'s sites
Personal sites and blogs
========================
@@ -193,8 +195,6 @@ Personal sites and blogs
* [Puckspage]( http://www.puckspage.org/ ) Political and personal blog in German. The name comes from the elf out of midsummer nights dream.
* [[LucaCapello]]'s [homepage](http://luca.pca.it)
* [[Martín Ferrari's homepage|http://tincho.org/]] and [[blog|http://blog.tincho.org/]]
-* [WikiAtoBR](http://wiki.hi.ato.br) Open, free and annoymous wiki. No need for account registering and login. It is Brazilian so it is in Portuguese.
-* [Manifesto](http://manifesto.hi.ato.br) Open, free and annoymous blog. No need for account registering and login. It is Brazilian so it is in Portuguese.
* [Z is for Zombies](http://blog.zouish.org/) — personal blog/site of Francesca Ciceri
* Julien Lefrique's [homepage](http://julien.lefrique.name/), hosted on [GitHub pages](https://github.com/jlefrique/jlefrique.github.com) with CGI disabled
* [Anarcat's homepage](http://anarcat.ath.cx/) - with a custom [[theme|theme_market]]
@@ -207,3 +207,9 @@ Personal sites and blogs
* [Amitai Schlair's site](http://www.schmonz.com/)
* My ([[spalax]]) [professional website](http://paternault.fr)
* [Aloodo Blog](http://blog.aloodo.org/)
+* Ninguém tem blog! - Restricted ikiwiki hosting
+ * [Dissertos radicais](http://dissertosradicais.tem.blog.br)
+ * [E pelas praças não terá nome](http://epelaspracasnaoteranome.tem.blog.br)
+ * [Igreja Universal do Reino do Iuri](http://iuri.tem.blog.br)
+ * [Mim](http://mim.tem.blog.br)
+* [Mídia Capoeira](https://capoeira.li/blog/) - independent journalism initiative