diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-03-27 15:09:41 -0400 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-03-27 15:09:41 -0400 |
| commit | 825e2b1378b1def4980e36642ed84999599eb017 (patch) | |
| tree | 8c5225715c9cf7a3405dbc679f124f74ca9983e7 /doc/ikiwikiusers.mdwn | |
| parent | f4a1732b0e65ea4459098e4e852dff10a5af9320 (diff) | |
| parent | c8237b4351f6023b3d3a661df2568c6d7488b8cf (diff) | |
Merge branch 'master' into po
Conflicts:
debian/control
Diffstat (limited to 'doc/ikiwikiusers.mdwn')
| -rw-r--r-- | doc/ikiwikiusers.mdwn | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index 8dea61f6a..1a24ff322 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -44,6 +44,7 @@ Projects & Organizations * [St Hugh of Lincoln Primary School in Surrey](http://hugh.vm.bytemark.co.uk/) * [Pigro Network](http://www.pigro.net) is running a hg based ikiwiki. (And provides ikiwiki hosting for $10/m.) * [Cosin Homepage](http://cosin.ch) uses an Ikiwiki with a subversion repository. +* [Bosco Free Orienteering Software](http://bosco.durcheinandertal.ch) Personal sites and blogs ======================== @@ -116,6 +117,8 @@ Personal sites and blogs * [muammar's site](http://muammar.me) * [Per Bothner's blog](http://per.bothner.com/blog/) * [Bernd Zeimetz (bzed)](http://bzed.de/) +* [Gaudenz Steinlin](http://gaudenz.durcheinandertal.ch) +* [Simon Kjika'qawej C.](http://simonraven.kisikew.org/ikiwiki/) Please note it might change location at any time (likely wiki.k.o or under /wiki/ at simonraven.k.o). Please feel free to add your own ikiwiki site! |