diff options
| author | intrigeri <intrigeri@boum.org> | 2010-06-29 15:53:51 +0200 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2010-06-29 15:53:51 +0200 |
| commit | 1786b106a9c7f448136ff47d9b6dd26d48a5dd2e (patch) | |
| tree | edfeed77be4a56ed06095bd67eb7cbc05a1a1eca /doc/ikiwikiusers.mdwn | |
| parent | b225fdc44d4b3d2853db622d59aed7b59788aeec (diff) | |
| parent | be60d261e6cbee094e4df74e1bb24c8ad3dc393d (diff) | |
Merge remote branch 'upstream/master' into prv/po
Conflicts:
doc/plugins/po.mdwn
Diffstat (limited to 'doc/ikiwikiusers.mdwn')
| -rw-r--r-- | doc/ikiwikiusers.mdwn | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index 8fb348c3d..e2465108a 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -147,6 +147,7 @@ Personal sites and blogs * [Ertug Karamatli](http://pages.karamatli.com) * [Jonatan Walck](http://jonatan.walck.i2p/) a weblog + wiki over [I2P](http://i2p2.de/). Also [mirrored](http://jonatan.walck.se/) to the Internet a few times per day. * [Daniel Wayne Armstrong](http://circuidipity.com/) +* [Mukund](https://www.mukund.org/) Please feel free to add your own ikiwiki site! |