diff options
| author | Joey Hess <joeyh@joeyh.name> | 2019-01-21 11:44:58 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2019-01-21 11:44:58 -0400 |
| commit | beaebab04bfa87b18286ecc1e8aef4ae87615e57 (patch) | |
| tree | 9d1873df01ca65083239a68f32593a9c371607a5 /doc | |
| parent | 4cb6f48aff6645227dae5c7852d3122e4046142b (diff) | |
| parent | 0b53772b99248d2868fac688cdaa227ad61ac08e (diff) | |
| download | ikiwiki-beaebab04bfa87b18286ecc1e8aef4ae87615e57.tar ikiwiki-beaebab04bfa87b18286ecc1e8aef4ae87615e57.tar.gz | |
Merge branch 'master' of ssh://git.ikiwiki.info
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/examples/blog/posts/hthn.mdwn | 1 | ||||
| -rw-r--r-- | doc/ikiwikiusers.mdwn | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/doc/examples/blog/posts/hthn.mdwn b/doc/examples/blog/posts/hthn.mdwn new file mode 100644 index 000000000..8fb80c2fa --- /dev/null +++ b/doc/examples/blog/posts/hthn.mdwn @@ -0,0 +1 @@ +thonk diff --git a/doc/ikiwikiusers.mdwn b/doc/ikiwikiusers.mdwn index 3a810a731..d14e4898c 100644 --- a/doc/ikiwikiusers.mdwn +++ b/doc/ikiwikiusers.mdwn @@ -194,7 +194,7 @@ Personal sites and blogs * [Salient Dream](http://www.salientdream.com/) - All Things Strange. * [Anton Berezin's blog](http://blog.tobez.org/) * [Waldgarten]( http://waldgarten.greenonion.org/ ) News and documentation of a permaculture inspired neighbourhood-garden located in Hamburg, Germany. -* [Frohdo](https://frohdo.de) - With raw food against back pain and other diseases +* [Waldfarm](https://waldfarm.de) - Natural Life by Natural Farming, Natürliches Leben mit natürlicher Landwirtschaft * [[OscarMorante]]'s [personal site](http://oscar.morante.eu). * [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) |