X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=doc%2Fbranches.mdwn;h=b7b9164acd0c8bcbc3cc96e5e0e2134af1933b56;hb=f6440dd5e64e67ebbdba5a0a7913d9783ef35f3b;hp=5149d79f94695f9f20b396185b2e66aa3621f8d5;hpb=8e8311718a0ca4d52aa86a9c8cc439430b11a468;p=ikiwiki.git

diff --git a/doc/branches.mdwn b/doc/branches.mdwn
index 5149d79f9..b7b9164ac 100644
--- a/doc/branches.mdwn
+++ b/doc/branches.mdwn
@@ -22,4 +22,4 @@ Long-lived branches in the main git repository:
 * `pristine-tar` contains deltas that
   [pristine-tar](http://kitenet.net/~joey/code/pristine-tar)
   can use to recreate released tarballs of ikiwiki
-
+* `setup` contains the ikiwiki.setup file for this site