aboutsummaryrefslogtreecommitdiff
path: root/doc/branches.mdwn
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2011-05-20 16:08:14 -0400
committerJoey Hess <joey@kitenet.net>2011-05-20 16:08:14 -0400
commitc9ad71815341c88f17ac1fa0720bb0d62132a156 (patch)
tree20e02e6d148239f42f0e06810dcce42bcf2d1c30 /doc/branches.mdwn
parent0cb2e7833525bca97a33e4a70d7304b85c24b0f0 (diff)
downloadikiwiki-c9ad71815341c88f17ac1fa0720bb0d62132a156.tar
ikiwiki-c9ad71815341c88f17ac1fa0720bb0d62132a156.tar.gz
document the setup branch
Now that ikiwiki.info is hosted at branchable.com, the setup file for the site automatically goes in there.
Diffstat (limited to 'doc/branches.mdwn')
-rw-r--r--doc/branches.mdwn2
1 files changed, 1 insertions, 1 deletions
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