diff options
| author | Joey Hess <joey@kitenet.net> | 2010-04-23 16:43:44 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-04-23 16:43:44 -0400 |
| commit | 7bba52254569047ef1d9f5752096f155b0a2be77 (patch) | |
| tree | 0c79effe8cbf7847e36557e4ed9fe10d08728a33 /doc/git.mdwn | |
| parent | 6486452e4c94f5699d98d13e25a361435ed3ddeb (diff) | |
| parent | d822e37d0efc34f2267f275030de11cd3c7ff7bb (diff) | |
| download | ikiwiki-7bba52254569047ef1d9f5752096f155b0a2be77.tar ikiwiki-7bba52254569047ef1d9f5752096f155b0a2be77.tar.gz | |
Merge branch 'master' into templatemove
Conflicts:
doc/templates.mdwn
Diffstat (limited to 'doc/git.mdwn')
| -rw-r--r-- | doc/git.mdwn | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/git.mdwn b/doc/git.mdwn index 0f280fb35..a5fd742ca 100644 --- a/doc/git.mdwn +++ b/doc/git.mdwn @@ -62,6 +62,7 @@ think about merging them. This is recommended. :-) ([browse](http://git.liegesta.at/?p=ikiwiki.git;a=summary)) * [[GustafThorslund]] `http://gustaf.thorslund.org/src/ikiwiki.git` * [[peteg]] `git://git.hcoop.net/git/peteg/ikiwiki.git` +* [[privat]] `git://github.com/privat/ikiwiki.git` ## branches |