Merge commit 'upstream/master' into pub/po

[ikiwiki.git] / doc / git.mdwn

diff --git a/doc/git.mdwn b/doc/git.mdwn
index e9c2e040f1d925aee3ec55e09219bf416fc2e987..8aa7250a7e543b7ef658e1d79981813740544e1b 100644 (file)
--- a/doc/git.mdwn
+++ b/doc/git.mdwn
@@ -37,6 +37,8 @@ into [[Joey]]'s working tree. This is recommended. :-)
 * [[intrigeri]] `git://gaffer.ptitcanardnoir.org/ikiwiki.git`
 * [[gmcmanus]] `git://github.com/gmcmanus/ikiwiki.git`
 * [[jelmer]] `git://git.samba.org/jelmer/ikiwiki.git`
+* [[hendry]] `git://webconverger.org/git/ikiwiki`
+* [[jon]] `git://github.com/jmtd/ikiwiki.git`
 
 ## branches
 
@@ -49,7 +51,6 @@ Some of the branches included in the main repository include:
   instead of xhtml.
 * `wikiwyg` adds [[todo/wikiwyg]] support. It is unmerged pending some
   changes.
-* `darcs` is being used to add darcs support.
 * `debian-stable` is used for updates to the old version included in
   Debian's stable release, and `debian-testing` is used for updates to
   Debian's testing release.