diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-04-04 17:27:48 -0400 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-04-04 17:27:48 -0400 |
| commit | 8e92468eae9ac0ab8161a0c71ff6c6a0a8aef07a (patch) | |
| tree | 9e26465e0ca98a5f3cbc6c72a0cace4bf83b93db /underlays/basewiki | |
| parent | 78a69e5bd632eb86ef8135e9c1d05d2c48b43362 (diff) | |
| parent | 08fda4c9d374de1d3de3172a192d4d915d3dc0c1 (diff) | |
Merge branch 'master'
Conflicts:
doc/ikiwiki-makerepo.mdwn
Diffstat (limited to 'underlays/basewiki')
| l--------- | underlays/basewiki/directive.mdwn | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/underlays/basewiki/directive.mdwn b/underlays/basewiki/directive.mdwn deleted file mode 120000 index e8ce42cba..000000000 --- a/underlays/basewiki/directive.mdwn +++ /dev/null @@ -1 +0,0 @@ -../../doc/ikiwiki/directive.mdwn
\ No newline at end of file |