diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-08-31 16:16:51 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-08-31 16:16:51 +0200 |
| commit | bd3fdf887bdfc2f935214847a68805b174fcf2d3 (patch) | |
| tree | be76a4cce8c35062482901c04f986f194cd6a4e5 /ikiwiki_admin.setup | |
| parent | 5b188df8f30768d182e6d7cdc0d07fa86dd8f653 (diff) | |
| parent | eda71b62ac34cea62eb9745283443a7813fd383f (diff) | |
Merge branch 'da' into _multilang
Conflicts (resolved manually):
ikiwiki_da.setup
Diffstat (limited to 'ikiwiki_admin.setup')
0 files changed, 0 insertions, 0 deletions