diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-08-11 11:25:03 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-08-11 11:25:03 +0200 |
| commit | c8b411641e28f3d2d760752391edca67afc554b2 (patch) | |
| tree | 2dbc7aaf88892eb83fc75a02f6b92c18f09a1a8c /.gitignore | |
| parent | 665db7a4af7e86d6202f0295cbc3a8b12708ca00 (diff) | |
| parent | 3aa64f2c1b42806b5d38e0a20feedcf01122384d (diff) | |
Merge branch 'master' into allinone
Conflicts (manually resolved):
ikiwiki.setup
Also, examplewiki -> samplewiki applied to admin setup too.
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions