diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-10-23 16:33:11 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-10-23 16:33:11 +0200 |
| commit | 63076aa9fc75411320f7fd7b3c082ecc55ea48c8 (patch) | |
| tree | 8bf9568e5380f84f76ae370c57277ff64b280f0f /ikiwiki_admin.setup | |
| parent | eaf929ccf7ff1f4d0175dc607754d07c1b918485 (diff) | |
| parent | 7a19f30c3cfb3ea4b00947eeffabc261ceac064c (diff) | |
Merge branch 'allinone-nb' into allinone-multilang
Conflicts (manually resolved):
ikiwiki_nb.setup
ikiwiki_nb_admin.setup
Diffstat (limited to 'ikiwiki_admin.setup')
0 files changed, 0 insertions, 0 deletions