Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info

[git.ikiwiki.info.git] / doc / git.mdwn

diff --git a/doc/git.mdwn b/doc/git.mdwn
index a0b9c950ff612504f9620705ec1f218dcd94a84c..88608d4b550dc0e3e8969ef053a0c67c06fb2836 100644 (file)
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -64,6 +64,7 @@ think about merging them. This is recommended. :-)
 * [[peteg]] `git://git.hcoop.net/git/peteg/ikiwiki.git`
 * [[privat]] `git://github.com/privat/ikiwiki.git`
 * [[blipvert]] `git://github.com/blipvert/ikiwiki.git`
 * [[peteg]] `git://git.hcoop.net/git/peteg/ikiwiki.git`
 * [[privat]] `git://github.com/privat/ikiwiki.git`
 * [[blipvert]] `git://github.com/blipvert/ikiwiki.git`

+* [[bzed|BerndZeimetz]] `git://git.recluse.de/users/bzed/ikiwiki.git`

 
 ## branches
 
 
 ## branches
 


@@ -76,8 +77,6 @@ Some of the branches included in the main repository include:
 * `gallery` contains the [[todo/Gallery]] plugin. It's not yet merged
   due to license issues.  Also some bits need to be tweaked to make it
   work with the current *master* branch again.
 * `gallery` contains the [[todo/Gallery]] plugin. It's not yet merged
   due to license issues.  Also some bits need to be tweaked to make it
   work with the current *master* branch again.

-* `html` is an unfinished attempt at making ikiwiki output HTML 4.01
-  instead of xhtml.

 * `wikiwyg` adds [[todo/wikiwyg]] support. It is unmerged pending some
   changes.
 * `debian-stable` is used for updates to the old version included in
 * `wikiwyg` adds [[todo/wikiwyg]] support. It is unmerged pending some
   changes.
 * `debian-stable` is used for updates to the old version included in