X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=doc%2Fbranches.mdwn;h=b7b9164acd0c8bcbc3cc96e5e0e2134af1933b56;hb=d02b1a5e8902a857d55798d4a3baa6668a4f8bfb;hp=5149d79f94695f9f20b396185b2e66aa3621f8d5;hpb=da371733b53f564ec8dd349009a126552daaf84a;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