diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-08-31 16:34:56 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-08-31 16:34:56 +0200 |
| commit | f96b7a3d174bdb8429781a2e5e9ddc2137d9414e (patch) | |
| tree | 01a2ca48121047fcca5658f059e67f8e78e5a47d /ikiwiki_da.setup | |
| parent | 1ee90b73470289496a60f6e9bf5c4d6e889df66b (diff) | |
| parent | 612b406475429d006fd7a546288abf6021c7c5f5 (diff) | |
Merge branch 'allinone-nb' into allinone-multilang
Conflicts (resolved manually):
ikiwiki_nb.setup
ikiwiki_nb_admin.setup
Diffstat (limited to 'ikiwiki_da.setup')
0 files changed, 0 insertions, 0 deletions