diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-08-30 20:39:42 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-08-30 20:39:42 +0200 |
| commit | f47a41c968c106146f560714f7b6ae4eeff757a2 (patch) | |
| tree | 3e1aa17148f25a1f2d36681fc2e1655473998286 /ikiwiki_admin.setup | |
| parent | c3415931acf4f0b1eefd51b2efd42bed952fc5fe (diff) | |
| parent | 57f8768e1221a3ef67bf0496611975703fe8fac8 (diff) | |
Merge branch '_multilang' into allinone-multilang
Conflicts (manually resolved):
ikiwiki.setup
Diffstat (limited to 'ikiwiki_admin.setup')
0 files changed, 0 insertions, 0 deletions