From: Joey Hess <joey@kitenet.net>
Date: Fri, 20 May 2011 20:08:14 +0000 (-0400)
Subject: document the setup branch
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/c9ad71815341c88f17ac1fa0720bb0d62132a156

document the setup branch

Now that ikiwiki.info is hosted at branchable.com, the setup file for the
site automatically goes in there.
---

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